diff --git a/.metadata/.log b/.metadata/.log index 90d92e2..e14a02b 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -1,10 +1,10 @@ -!SESSION 2016-11-12 15:28:17.844 ----------------------------------------------- -eclipse.buildId=4.6.1.M20160907-1200 -java.version=1.8.0_60 -java.vendor=Oracle Corporation -BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US -Framework arguments: -product org.eclipse.epp.package.java.product -Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.java.product - -!ENTRY org.eclipse.core.net 1 0 2016-11-12 15:28:54.631 -!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences +!SESSION 2016-11-12 15:28:17.844 ----------------------------------------------- +eclipse.buildId=4.6.1.M20160907-1200 +java.version=1.8.0_60 +java.vendor=Oracle Corporation +BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US +Framework arguments: -product org.eclipse.epp.package.java.product +Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.java.product + +!ENTRY org.eclipse.core.net 1 0 2016-11-12 15:28:54.631 +!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs index dffc6b5..77fe583 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -version=1 +eclipse.preferences.version=1 +version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs index 1768a1e..516ee5b 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -1,13 +1,13 @@ -content_assist_proposals_background=255,255,255 -content_assist_proposals_foreground=0,0,0 -eclipse.preferences.version=1 -fontPropagated=true -org.eclipse.jdt.ui.editor.tab.width= -org.eclipse.jdt.ui.formatterprofiles.version=12 -org.eclipse.jdt.ui.javadoclocations.migrated=true -org.eclipse.jface.textfont=1|Monaco|11.0|0|COCOA|1|; -proposalOrderMigrated=true -spelling_locale_initialized=true -tabWidthPropagated=true -useAnnotationsPrefPage=true -useQuickDiffPrefPage=true +content_assist_proposals_background=255,255,255 +content_assist_proposals_foreground=0,0,0 +eclipse.preferences.version=1 +fontPropagated=true +org.eclipse.jdt.ui.editor.tab.width= +org.eclipse.jdt.ui.formatterprofiles.version=12 +org.eclipse.jdt.ui.javadoclocations.migrated=true +org.eclipse.jface.textfont=1|Monaco|11.0|0|COCOA|1|; +proposalOrderMigrated=true +spelling_locale_initialized=true +tabWidthPropagated=true +useAnnotationsPrefPage=true +useQuickDiffPrefPage=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs index 67b1d96..c05c14c 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -org.eclipse.m2e.discovery.pref.projects= +eclipse.preferences.version=1 +org.eclipse.m2e.discovery.pref.projects= diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs index 43e97e4..e5a71f2 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -mylyn.attention.migrated=true +eclipse.preferences.version=1 +mylyn.attention.migrated=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs index 8d462a6..e0b8c16 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true +eclipse.preferences.version=1 +org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs index 2b60c21..46ef804 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -1,5 +1,5 @@ -eclipse.preferences.version=1 -migrated.task.repositories.secure.store=true -org.eclipse.mylyn.tasks.ui.filters.nonmatching=true -org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true -org.eclipse.mylyn.tasks.ui.welcome.message=true +eclipse.preferences.version=1 +migrated.task.repositories.secure.store=true +org.eclipse.mylyn.tasks.ui.filters.nonmatching=true +org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true +org.eclipse.mylyn.tasks.ui.welcome.message=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs index 56cd496..848e263 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -org.eclipse.team.ui.first_time=false +eclipse.preferences.version=1 +org.eclipse.team.ui.first_time=false diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs index 61f3bb8..a6c2629 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -overviewRuler_migration=migrated_3.1 +eclipse.preferences.version=1 +overviewRuler_migration=migrated_3.1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs index 594ac20..7d4bbb2 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -1,5 +1,5 @@ -PROBLEMS_FILTERS_MIGRATE=true -eclipse.preferences.version=1 -platformState=1478982499589 -quickStart=false -tipsAndTricks=true +PROBLEMS_FILTERS_MIGRATE=true +eclipse.preferences.version=1 +platformState=1478982499589 +quickStart=false +tipsAndTricks=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs index dd77496..bf49ea8 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs @@ -1,3 +1,3 @@ -//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false -PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery; -eclipse.preferences.version=1 +//org.eclipse.ui.commands/state/org.eclipse.ui.navigator.resources.nested.changeProjectPresentation/org.eclipse.ui.commands.radioState=false +PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery; +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 379cafa..f769a36 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,2385 +1,2385 @@ - - - - activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration - ModelMigrationProcessor.001 - - - - - - - - topLevel - - - - - persp.actionSet:org.eclipse.mylyn.doc.actionSet - persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation - persp.actionSet:org.eclipse.ui.cheatsheets.actionSet - persp.actionSet:org.eclipse.search.searchActionSet - persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo - persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet - persp.actionSet:org.eclipse.ui.actionSet.keyBindings - persp.actionSet:org.eclipse.ui.actionSet.openFiles - persp.actionSet:org.eclipse.debug.ui.launchActionSet - persp.actionSet:org.eclipse.jdt.ui.JavaActionSet - persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet - persp.actionSet:org.eclipse.ui.NavigateActionSet - persp.viewSC:org.eclipse.jdt.ui.PackageExplorer - persp.viewSC:org.eclipse.jdt.ui.TypeHierarchy - persp.viewSC:org.eclipse.jdt.ui.SourceView - persp.viewSC:org.eclipse.jdt.ui.JavadocView - persp.viewSC:org.eclipse.search.ui.views.SearchView - persp.viewSC:org.eclipse.ui.console.ConsoleView - persp.viewSC:org.eclipse.ui.views.ContentOutline - persp.viewSC:org.eclipse.ui.views.ProblemView - persp.viewSC:org.eclipse.ui.views.ResourceNavigator - persp.viewSC:org.eclipse.ui.views.TaskList - persp.viewSC:org.eclipse.ui.views.ProgressView - persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer - persp.viewSC:org.eclipse.ui.texteditor.TemplatesView - persp.viewSC:org.eclipse.pde.runtime.LogView - persp.newWizSC:org.eclipse.jdt.ui.wizards.JavaProjectWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewPackageCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewClassCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewEnumCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard - persp.newWizSC:org.eclipse.ui.wizards.new.folder - persp.newWizSC:org.eclipse.ui.wizards.new.file - persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard - persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective - persp.perspSC:org.eclipse.debug.ui.DebugPerspective - persp.viewSC:org.eclipse.ant.ui.views.AntView - persp.showIn:org.eclipse.egit.ui.RepositoriesView - persp.actionSet:org.eclipse.debug.ui.breakpointActionSet - persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet - persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard - persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet - persp.showIn:org.eclipse.jdt.ui.PackageExplorer - persp.showIn:org.eclipse.team.ui.GenericHistoryView - persp.showIn:org.eclipse.ui.views.ResourceNavigator - persp.showIn:org.eclipse.ui.navigator.ProjectExplorer - persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks - persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task - - - - org.eclipse.e4.primaryNavigationStack - active - - - - - - - - - - - - - - - - - - - org.eclipse.e4.secondaryNavigationStack - - - - - - - - org.eclipse.e4.secondaryDataStack - - - - - - - - - - - - - - - - - - - - - - View - categoryTag:Help - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Help - - - - org.eclipse.e4.primaryDataStack - EditorStack - - - - - - - View - categoryTag:Java - active - activeOnClose - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - - View - categoryTag:General - - - - - View - categoryTag:Ant - - - - - View - categoryTag:Git - - - - - View - categoryTag:Java - - - - - - View - categoryTag:Mylyn - - ViewMenu - menuContribution:menu - - - - - - toolbarSeparator - - - - Draggable - - - - toolbarSeparator - - - - Draggable - - - Draggable - - - Draggable - - - toolbarSeparator - - - - Draggable - - - - toolbarSeparator - - - - toolbarSeparator - - - - Draggable - - - stretch - SHOW_RESTORE_MENU - - - Draggable - HIDEABLE - SHOW_RESTORE_MENU - - - - - stretch - - - Draggable - - - Draggable - - - - - - TrimStack - Draggable - - - - - - - - - - - - - - - - - - - - - - platform:cocoa - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - - - platform:cocoa - - - - - - - - - - platform:cocoa - - - - - - - platform:cocoa - - - - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - - - - - platform:cocoa - - - platform:cocoa - - - - - - - - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - - - - - - - - - platform:cocoa - - - platform:cocoa - - - - - - - - - platform:cocoa - - - - - - - - - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - - - - - - - - - platform:cocoa - - - - - - - - - - - - - - - - platform:cocoa - - - - platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Editor - - - - - View - categoryTag:Ant - - - - - View - categoryTag:Gradle - - - - - View - categoryTag:Gradle - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:Git - - - - - View - categoryTag:General - - - - - View - categoryTag:Help - - - - - View - categoryTag:Debug - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java Browsing - - - - - View - categoryTag:Java - - - - - View - categoryTag:General - - - - - View - categoryTag:Java - - - - - View - categoryTag:Java - - - - - View - categoryTag:Maven - - - - - View - categoryTag:Maven - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Mylyn - - - - - View - categoryTag:Oomph - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:Code Recommenders - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:Team - - - - - View - categoryTag:Team - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:Help - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:General - - - - - View - categoryTag:XML - - - - - View - categoryTag:XML - - - - - - - glue - move_after:PerspectiveSpacer - SHOW_RESTORE_MENU - - - move_after:Spacer Glue - HIDEABLE - SHOW_RESTORE_MENU - - - glue - move_after:SearchField - SHOW_RESTORE_MENU - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration + ModelMigrationProcessor.001 + + + + + + + + topLevel + + + + + persp.actionSet:org.eclipse.mylyn.doc.actionSet + persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation + persp.actionSet:org.eclipse.ui.cheatsheets.actionSet + persp.actionSet:org.eclipse.search.searchActionSet + persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation + persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation + persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo + persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet + persp.actionSet:org.eclipse.ui.actionSet.keyBindings + persp.actionSet:org.eclipse.ui.actionSet.openFiles + persp.actionSet:org.eclipse.debug.ui.launchActionSet + persp.actionSet:org.eclipse.jdt.ui.JavaActionSet + persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet + persp.actionSet:org.eclipse.ui.NavigateActionSet + persp.viewSC:org.eclipse.jdt.ui.PackageExplorer + persp.viewSC:org.eclipse.jdt.ui.TypeHierarchy + persp.viewSC:org.eclipse.jdt.ui.SourceView + persp.viewSC:org.eclipse.jdt.ui.JavadocView + persp.viewSC:org.eclipse.search.ui.views.SearchView + persp.viewSC:org.eclipse.ui.console.ConsoleView + persp.viewSC:org.eclipse.ui.views.ContentOutline + persp.viewSC:org.eclipse.ui.views.ProblemView + persp.viewSC:org.eclipse.ui.views.ResourceNavigator + persp.viewSC:org.eclipse.ui.views.TaskList + persp.viewSC:org.eclipse.ui.views.ProgressView + persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer + persp.viewSC:org.eclipse.ui.texteditor.TemplatesView + persp.viewSC:org.eclipse.pde.runtime.LogView + persp.newWizSC:org.eclipse.jdt.ui.wizards.JavaProjectWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewPackageCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewClassCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewEnumCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard + persp.newWizSC:org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard + persp.newWizSC:org.eclipse.ui.wizards.new.folder + persp.newWizSC:org.eclipse.ui.wizards.new.file + persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard + persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective + persp.perspSC:org.eclipse.debug.ui.DebugPerspective + persp.viewSC:org.eclipse.ant.ui.views.AntView + persp.showIn:org.eclipse.egit.ui.RepositoriesView + persp.actionSet:org.eclipse.debug.ui.breakpointActionSet + persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet + persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard + persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet + persp.showIn:org.eclipse.jdt.ui.PackageExplorer + persp.showIn:org.eclipse.team.ui.GenericHistoryView + persp.showIn:org.eclipse.ui.views.ResourceNavigator + persp.showIn:org.eclipse.ui.navigator.ProjectExplorer + persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks + persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task + + + + org.eclipse.e4.primaryNavigationStack + active + + + + + + + + + + + + + + + + + + + org.eclipse.e4.secondaryNavigationStack + + + + + + + + org.eclipse.e4.secondaryDataStack + + + + + + + + + + + + + + + + + + + + + + View + categoryTag:Help + + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + + + View + categoryTag:Help + + + + org.eclipse.e4.primaryDataStack + EditorStack + + + + + + + View + categoryTag:Java + active + activeOnClose + + ViewMenu + menuContribution:menu + + + + + + + View + categoryTag:Java + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + + View + categoryTag:General + + ViewMenu + menuContribution:menu + + + + + + + View + categoryTag:General + + + + + View + categoryTag:Ant + + + + + View + categoryTag:Git + + + + + View + categoryTag:Java + + + + + + View + categoryTag:Mylyn + + ViewMenu + menuContribution:menu + + + + + + toolbarSeparator + + + + Draggable + + + + toolbarSeparator + + + + Draggable + + + Draggable + + + Draggable + + + toolbarSeparator + + + + Draggable + + + + toolbarSeparator + + + + toolbarSeparator + + + + Draggable + + + stretch + SHOW_RESTORE_MENU + + + Draggable + HIDEABLE + SHOW_RESTORE_MENU + + + + + stretch + + + Draggable + + + Draggable + + + + + + TrimStack + Draggable + + + + + + + + + + + + + + + + + + + + + + platform:cocoa + + + + + + + platform:cocoa + + + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + + + platform:cocoa + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + + + + platform:cocoa + + + + + + + + + + platform:cocoa + + + + + + + platform:cocoa + + + + + + + + + + + platform:cocoa + + + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + + + + + + platform:cocoa + + + platform:cocoa + + + + + + + + + + + + + + + platform:cocoa + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + + + + + + platform:cocoa + + + + + platform:cocoa + + + + + + + + + + + + platform:cocoa + + + platform:cocoa + + + + + + + + + platform:cocoa + + + + + + + + + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + + + platform:cocoa + + + platform:cocoa + + + + + + platform:cocoa + + + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + platform:cocoa + + + + + + + + + platform:cocoa + + + + + platform:cocoa + + + + + + + + + + + + platform:cocoa + + + + + + + + + + + + + + + + platform:cocoa + + + + platform:cocoa + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + platform:cocoa + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor + + + + + View + categoryTag:Ant + + + + + View + categoryTag:Gradle + + + + + View + categoryTag:Gradle + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Git + + + + + View + categoryTag:Git + + + + + View + categoryTag:Git + + + + + View + categoryTag:Git + + + + + View + categoryTag:Git + + + + + View + categoryTag:General + + + + + View + categoryTag:Help + + + + + View + categoryTag:Debug + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java Browsing + + + + + View + categoryTag:Java Browsing + + + + + View + categoryTag:Java Browsing + + + + + View + categoryTag:Java Browsing + + + + + View + categoryTag:Java + + + + + View + categoryTag:General + + + + + View + categoryTag:Java + + + + + View + categoryTag:Java + + + + + View + categoryTag:Maven + + + + + View + categoryTag:Maven + + + + + View + categoryTag:Mylyn + + + + + View + categoryTag:Mylyn + + + + + View + categoryTag:Mylyn + + + + + View + categoryTag:Mylyn + + + + + View + categoryTag:Oomph + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:Code Recommenders + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:Team + + + + + View + categoryTag:Team + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:Help + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:General + + + + + View + categoryTag:XML + + + + + View + categoryTag:XML + + + + + + + glue + move_after:PerspectiveSpacer + SHOW_RESTORE_MENU + + + move_after:Spacer Glue + HIDEABLE + SHOW_RESTORE_MENU + + + glue + move_after:SearchField + SHOW_RESTORE_MENU + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json index 56cef3e..b3453a5 100644 --- a/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json +++ b/.metadata/.plugins/org.eclipse.epp.logging.aeri.ide/org.eclipse.epp.logging.aeri.ide.server/server-config.json @@ -1,70 +1,70 @@ -{ - "version": "v1", - "title": "Eclipse Automated Error Reporting", - "timestamp": 1478982549563, - "ttl": 10080, - "helpUrl": "https://dev.eclipse.org/recommenders/community/aeri/v2/help/", - "feedbackUrl": "http://ctrlflow.com/automated-error-reporting", - "aboutUrl": "https://wiki.eclipse.org/EPP/Logging", - "submitUrl": "https://dev.eclipse.org/recommenders/community/confess/0.6/reports/", - "maxReportSize": 262144, - "problemsUrl": "https://www.eclipse.org/downloads/download.php?r\u003d1\u0026file\u003d/technology/epp/logging/problems.zip", - "problemsTtl": 20160, - "connectTimeout": 10, - "socketTimeout": 10, - "acceptedProducts": [ - "org.eclipse.*", - "org.fordiac.*" - ], - "acceptedPlugins": [ - "org.apache.log4j.*", - "org.eclipse.*", - "org.fordiac.*" - ], - "acceptedPackages": [ - "ch.qos.*", - "com.cforcoding.*", - "com.google.*", - "com.gradleware.tooling.*", - "com.mountainminds.eclemma.*", - "com.naef.*", - "com.sun.*", - "java.*", - "javafx.*", - "javax.*", - "org.apache.*", - "org.eclipse.*", - "org.fordiac.*", - "org.gradle.*", - "org.jacoco.*", - "org.osgi.*", - "org.slf4j.*", - "sun.*" - ], - "requiredPackages": [ - "com.cforcoding.*", - "com.gradleware.tooling.*", - "com.mountainminds.eclemma.*", - "com.naef.*", - "org.eclipse.*", - "org.fordiac.*", - "org.gradle.*", - "org.jacoco.*" - ], - "acceptOtherPackages": true, - "acceptUiFreezes": true, - "ignoredStatuses": [ - ":java.io.IOException:There is not enough space on the disk", - ":java.net.*:", - "org.eclipse.core.filesystem::Could not delete*", - "org.eclipse.core.filesystem::Could not move*", - "org.eclipse.core.runtime::Invalid input url*", - "org.eclipse.epp.mpc.ui:java.io.IOException:", - "org.eclipse.equinox.p2.*::", - "org.eclipse.jface:java.io.IOException:Unable to resolve plug-in*", - "org.eclipse.oomph.setup.core:$org.apache.http.ConnectionClosedException:", - "org.eclipse.pde.core::The current target platform contains errors*", - "org.eclipse.ui::Conflicting handlers for*" - ], - "problemsZipLastDownloadTimestamp": 0 +{ + "version": "v1", + "title": "Eclipse Automated Error Reporting", + "timestamp": 1478982549563, + "ttl": 10080, + "helpUrl": "https://dev.eclipse.org/recommenders/community/aeri/v2/help/", + "feedbackUrl": "http://ctrlflow.com/automated-error-reporting", + "aboutUrl": "https://wiki.eclipse.org/EPP/Logging", + "submitUrl": "https://dev.eclipse.org/recommenders/community/confess/0.6/reports/", + "maxReportSize": 262144, + "problemsUrl": "https://www.eclipse.org/downloads/download.php?r\u003d1\u0026file\u003d/technology/epp/logging/problems.zip", + "problemsTtl": 20160, + "connectTimeout": 10, + "socketTimeout": 10, + "acceptedProducts": [ + "org.eclipse.*", + "org.fordiac.*" + ], + "acceptedPlugins": [ + "org.apache.log4j.*", + "org.eclipse.*", + "org.fordiac.*" + ], + "acceptedPackages": [ + "ch.qos.*", + "com.cforcoding.*", + "com.google.*", + "com.gradleware.tooling.*", + "com.mountainminds.eclemma.*", + "com.naef.*", + "com.sun.*", + "java.*", + "javafx.*", + "javax.*", + "org.apache.*", + "org.eclipse.*", + "org.fordiac.*", + "org.gradle.*", + "org.jacoco.*", + "org.osgi.*", + "org.slf4j.*", + "sun.*" + ], + "requiredPackages": [ + "com.cforcoding.*", + "com.gradleware.tooling.*", + "com.mountainminds.eclemma.*", + "com.naef.*", + "org.eclipse.*", + "org.fordiac.*", + "org.gradle.*", + "org.jacoco.*" + ], + "acceptOtherPackages": true, + "acceptUiFreezes": true, + "ignoredStatuses": [ + ":java.io.IOException:There is not enough space on the disk", + ":java.net.*:", + "org.eclipse.core.filesystem::Could not delete*", + "org.eclipse.core.filesystem::Could not move*", + "org.eclipse.core.runtime::Invalid input url*", + "org.eclipse.epp.mpc.ui:java.io.IOException:", + "org.eclipse.equinox.p2.*::", + "org.eclipse.jface:java.io.IOException:Unable to resolve plug-in*", + "org.eclipse.oomph.setup.core:$org.apache.http.ConnectionClosedException:", + "org.eclipse.pde.core::The current target platform contains errors*", + "org.eclipse.ui::Conflicting handlers for*" + ], + "problemsZipLastDownloadTimestamp": 0 } \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml index a4ee3cb..6cd9562 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml @@ -1,2 +1,2 @@ - - + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml index 9e390f5..8c365b7 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -1,2 +1,2 @@ - - + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml index c08c91a..d84bb1d 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -1,10 +1,10 @@ - -
-
- - - - - -
-
+ +
+
+ + + + + +
+
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log index 6766dfa..2bbac51 100644 --- a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log @@ -1 +1 @@ -2016-11-12 15:29:07,113 [Worker-2] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache is not available. Remote download required. +2016-11-12 15:29:07,113 [Worker-2] INFO c.g.t.t.d.PublishedGradleVersions - Gradle version information cache is not available. Remote download required. diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml index e33758c..aea5414 100644 --- a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.7.0.20160603-1933.xml @@ -1,43 +1,43 @@ - - - - %date [%thread] %-5level %logger{35} - %msg%n - - - OFF - - - - - ${org.eclipse.m2e.log.dir}/0.log - - ${org.eclipse.m2e.log.dir}/%i.log - 1 - 10 - - - 100MB - - - %date [%thread] %-5level %logger{35} - %msg%n - - - - - - WARN - - - - - - - - - - - - - - - + + + + %date [%thread] %-5level %logger{35} - %msg%n + + + OFF + + + + + ${org.eclipse.m2e.log.dir}/0.log + + ${org.eclipse.m2e.log.dir}/%i.log + 1 + 10 + + + 100MB + + + %date [%thread] %-5level %logger{35} - %msg%n + + + + + + WARN + + + + + + + + + + + + + + + diff --git a/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup b/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup index 1f73e14..a1ef8f5 100644 --- a/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup +++ b/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup @@ -1,6 +1,6 @@ - - + + diff --git a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml index f4d0d6c..6d8282b 100644 --- a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml @@ -1,11 +1,11 @@ - -
-
- - -
-
- - -
-
+ +
+
+ + +
+
+ + +
+
diff --git a/.metadata/.plugins/org.eclipse.ui.intro/introstate b/.metadata/.plugins/org.eclipse.ui.intro/introstate index 236d56c..bc63a5b 100644 --- a/.metadata/.plugins/org.eclipse.ui.intro/introstate +++ b/.metadata/.plugins/org.eclipse.ui.intro/introstate @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml index 851c296..9a8f2a9 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -1,15 +1,15 @@ - -
-
- - - - - - - - - - -
-
+ +
+
+ + + + + + + + + + +
+
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml index e044b18..78ad30b 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/.metadata/version.ini b/.metadata/version.ini index 92fbb79..117e7c8 100644 --- a/.metadata/version.ini +++ b/.metadata/version.ini @@ -1,3 +1,3 @@ -#Sat Nov 12 15:28:50 EST 2016 -org.eclipse.core.runtime=2 -org.eclipse.platform=4.6.1.v20160907-1200 +#Sat Nov 12 15:28:50 EST 2016 +org.eclipse.core.runtime=2 +org.eclipse.platform=4.6.1.v20160907-1200 diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css index 96e4450..c6beca9 100644 --- a/WebContent/html/css/stylesheet.css +++ b/WebContent/html/css/stylesheet.css @@ -1,93 +1,93 @@ -body{ - background-color: #94969A; - padding-top: 50px; - height: 100vh; - overflow-x: hidden; -} - -a.divlink{ - color: black; -} - -div.sidebar{ - display: inline-block; - border-right-style: solid; - height: 100vh; - background-color: #E9EAEB; - width: 300px; - position: fixed; -} - -div.displayDevice{ - display: inline-block; - position: absolute; - padding-left: 30px; - width: 100%; - height: 100%; - overflow: scroll; - left: 300px; -} - -div.profileContainer{ - display: inline-block; - position: absolute; - padding-left: 30px; - width: 100%; - height: 100%; - overflow: scroll; - left: 200px; - top: 70px; -} - -div.modal{ - display:none; - position: fixed; - z-index: 1; - left: 0; - top: 0; - width: 100%; - height: 100%; - overflow: auto; - background-color: rgb(0,0,0); - background-color: rgba(0,0,0,0.4); -} - -div.modal-content{ - position: relative; - background-color: #fefefe; - margin: 5% auto; - padding: 10px; - border: 1px solid #888; - width: 80%; - max-height: 80%; - text-align: center; - vertical-align: center; - align-items: center; -} - -div.modal-body{ - padding: 10px; - overflow: auto; -} - -input[type=text]{ - width: 60%; -} - - -span.close{ - color: black; - float: right; - font-size: 28px; - font-weight: bold; -} -span.close:hover, -span.close:focus{ - color: black; - text-decoration: none; - cursor: pointer; -} -ul.nav{ - padding: 0px; -} - +body{ + background-color: #94969A; + padding-top: 50px; + height: 100vh; + overflow-x: hidden; +} + +a.divlink{ + color: black; +} + +div.sidebar{ + display: inline-block; + border-right-style: solid; + height: 100vh; + background-color: #E9EAEB; + width: 300px; + position: fixed; +} + +div.displayDevice{ + display: inline-block; + position: absolute; + padding-left: 30px; + width: 100%; + height: 100%; + overflow: scroll; + left: 300px; +} + +div.profileContainer{ + display: inline-block; + position: absolute; + padding-left: 30px; + width: 100%; + height: 100%; + overflow: scroll; + left: 200px; + top: 70px; +} + +div.modal{ + display:none; + position: fixed; + z-index: 1; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: rgb(0,0,0); + background-color: rgba(0,0,0,0.4); +} + +div.modal-content{ + position: relative; + background-color: #fefefe; + margin: 5% auto; + padding: 10px; + border: 1px solid #888; + width: 80%; + max-height: 80%; + text-align: center; + vertical-align: center; + align-items: center; +} + +div.modal-body{ + padding: 10px; + overflow: auto; +} + +input[type=text]{ + width: 60%; +} + + +span.close{ + color: black; + float: right; + font-size: 28px; + font-weight: bold; +} +span.close:hover, +span.close:focus{ + color: black; + text-decoration: none; + cursor: pointer; +} +ul.nav{ + padding: 0px; +} + diff --git a/WebContent/html/imgs/computerStick.png b/WebContent/html/imgs/computerStick.png deleted file mode 100644 index 38a5a64..0000000 Binary files a/WebContent/html/imgs/computerStick.png and /dev/null differ diff --git a/WebContent/html/imgs/ipad.png b/WebContent/html/imgs/ipad.png deleted file mode 100644 index dd56f42..0000000 Binary files a/WebContent/html/imgs/ipad.png and /dev/null differ diff --git a/WebContent/html/imgs/iphone.png b/WebContent/html/imgs/iphone.png deleted file mode 100644 index d4e9ee4..0000000 Binary files a/WebContent/html/imgs/iphone.png and /dev/null differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/license/license.pdf b/WebContent/html/imgs/my-icons-collection-devices/license/license.pdf new file mode 100644 index 0000000..bdeedb7 Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/license/license.pdf differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Camera.png b/WebContent/html/imgs/my-icons-collection-devices/png/Camera.png new file mode 100644 index 0000000..6e2f1ee Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Camera.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Computer.png b/WebContent/html/imgs/my-icons-collection-devices/png/Computer.png new file mode 100644 index 0000000..ab31afd Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Computer.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Router.png b/WebContent/html/imgs/my-icons-collection-devices/png/Router.png new file mode 100644 index 0000000..0c9148a Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Router.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Smartphone.png b/WebContent/html/imgs/my-icons-collection-devices/png/Smartphone.png new file mode 100644 index 0000000..2256dc0 Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Smartphone.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Tablet.png b/WebContent/html/imgs/my-icons-collection-devices/png/Tablet.png new file mode 100644 index 0000000..c1011a1 Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Tablet.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/iPod Touch.png b/WebContent/html/imgs/my-icons-collection-devices/png/iPod Touch.png new file mode 100644 index 0000000..c857d29 Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/iPod Touch.png differ diff --git a/WebContent/html/javascript/iconselect.js-1.0/css/lib/control/iconselect.css b/WebContent/html/javascript/iconselect.js-1.0/css/lib/control/iconselect.css index fe5ea25..b2021d1 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/css/lib/control/iconselect.css +++ b/WebContent/html/javascript/iconselect.js-1.0/css/lib/control/iconselect.css @@ -1,129 +1,129 @@ -/* -To change this license header, choose License Headers in Project Properties. -To change this template file, choose Tools | Templates -and open the template in the editor. -*/ -/* - Created on : Nov 28, 2013, 7:09:35 AM - Author : bugraozden -*/ - -.icon-select{ - width:0px; - } - - .icon-select .selected-box { - - position: relative; - margin: 0px; - padding: 0px; - width: 70px; /* sil */ - height: 60px; /* sil */ - border: 1px solid #999999; - /*background-color: #FFFFFF;*/ - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - - } - - .icon-select .selected-box:hover { - - position: relative; - margin: 0px; - padding: 0px; - width: 70px; /* sil */ - height: 60px; /* sil */ - border: 1px solid #000000; - background-color: #FFFFFF; - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - - } - - .icon-select .selected-icon { - - position: absolute; - margin: 0px; - padding: 0px; - top:5px; - left:5px; - width: 48px; /* sil */ - height: 48px; /* sil */ - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - - } - - .icon-select .component-icon{ - position: absolute; - bottom:5px; - right:4px; - } - - .icon-select .box { - - position: absolute; - top:0px; - left:71px; - margin: 0px; - padding: 0px; - width: 170px; /* sil */ - height: 170px; /* sil */ - border: 1px solid #EEEEEE; - background-color: #EEEEEE; - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - - - overflow:auto; - /* - -webkit-overflow-scrolling: touch; - */ - - } - - .icon-select .icon { - position: relative; - margin: 5px 0px 0px 5px; - padding: 0px; - width: 48px; /* sil */ - height: 48px; /* sil */ - border: 1px solid #CCCCCC; - background-color: #FFFFFF; - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - - overflow:hidden; - float: left; - } - - .icon-select .icon:hover { - border: 1px solid #000000; - } - - .icon-select .icon.selected { - position: relative; - margin: 5px 0px 0px 5px; - padding: 0px; - width: 48px; /* sil */ - height: 48px; /* sil */ - border: 1px solid #EEEEEE; - background-color: #EEEEEE; - - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - - overflow:hidden; - float: left; +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : Nov 28, 2013, 7:09:35 AM + Author : bugraozden +*/ + +.icon-select{ + width:0px; + } + + .icon-select .selected-box { + + position: relative; + margin: 0px; + padding: 0px; + width: 70px; /* sil */ + height: 60px; /* sil */ + border: 1px solid #999999; + /*background-color: #FFFFFF;*/ + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + + } + + .icon-select .selected-box:hover { + + position: relative; + margin: 0px; + padding: 0px; + width: 70px; /* sil */ + height: 60px; /* sil */ + border: 1px solid #000000; + background-color: #FFFFFF; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + + } + + .icon-select .selected-icon { + + position: absolute; + margin: 0px; + padding: 0px; + top:5px; + left:5px; + width: 48px; /* sil */ + height: 48px; /* sil */ + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + + } + + .icon-select .component-icon{ + position: absolute; + bottom:5px; + right:4px; + } + + .icon-select .box { + + position: absolute; + top:0px; + left:71px; + margin: 0px; + padding: 0px; + width: 170px; /* sil */ + height: 170px; /* sil */ + border: 1px solid #EEEEEE; + background-color: #EEEEEE; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + + + overflow:auto; + /* + -webkit-overflow-scrolling: touch; + */ + + } + + .icon-select .icon { + position: relative; + margin: 5px 0px 0px 5px; + padding: 0px; + width: 48px; /* sil */ + height: 48px; /* sil */ + border: 1px solid #CCCCCC; + background-color: #FFFFFF; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + + overflow:hidden; + float: left; + } + + .icon-select .icon:hover { + border: 1px solid #000000; + } + + .icon-select .icon.selected { + position: relative; + margin: 5px 0px 0px 5px; + padding: 0px; + width: 48px; /* sil */ + height: 48px; /* sil */ + border: 1px solid #EEEEEE; + background-color: #EEEEEE; + + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + + overflow:hidden; + float: left; } \ No newline at end of file diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example.html index 00528eb..8c78648 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example.html +++ b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example.html @@ -1,60 +1,60 @@ - - - - Icon/Image Select: Basic Example (Javascript) - - - - - - - - - - - -

Icon/Image Select: Basic Example (Javascript)

- -
- - - - - + + + + Icon/Image Select: Basic Example (Javascript) + + + + + + + + + + + +

Icon/Image Select: Basic Example (Javascript)

+ +
+ + + + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example2.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example2.html index 299f568..b6c4cc7 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example2.html +++ b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example2.html @@ -1,57 +1,57 @@ - - - - Icon/Image Select: Nano Example (Javascript) - - - - - - - - - - - -

Icon/Image Select: Nano Example (Javascript)

- -
- - - + + + + Icon/Image Select: Nano Example (Javascript) + + + + + + + + + + + +

Icon/Image Select: Nano Example (Javascript)

+ +
+ + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example3.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example3.html index 29d8fb0..ab60e43 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example3.html +++ b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example3.html @@ -1,57 +1,57 @@ - - - - Icon/Image Select: Vectoral Example (Javascript) - - - - - - - - - - - -

Icon/Image Select: Vectoral Example (Javascript)

- -
- - - + + + + Icon/Image Select: Vectoral Example (Javascript) + + + + + + + + + + + +

Icon/Image Select: Vectoral Example (Javascript)

+ +
+ + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example4.html b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example4.html index c4c6df0..5ae105e 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/icon-select-example4.html +++ b/WebContent/html/javascript/iconselect.js-1.0/icon-select-example4.html @@ -1,57 +1,57 @@ - - - - Icon/Image Select: Horizontal Example (Javascript) - - - - - - - - - - - -

Icon/Image Select: Horizontal Example (Javascript)

- -
- - - + + + + Icon/Image Select: Horizontal Example (Javascript) + + + + + + + + + + + +

Icon/Image Select: Horizontal Example (Javascript)

+ +
+ + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/lib/control/iconselect.js b/WebContent/html/javascript/iconselect.js-1.0/lib/control/iconselect.js index 317185f..3939777 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/lib/control/iconselect.js +++ b/WebContent/html/javascript/iconselect.js-1.0/lib/control/iconselect.js @@ -1,322 +1,322 @@ - -/** - * - * Created with NetBeans IDE - * - * Code : Icon Select JS - * Version : 1.0 - * - * User : Bugra OZDEN - * Site : http://www.bugraozden.com - * Mail : bugra.ozden@gmail.com - * - * Date : 10/30/13 - * Time : 01:10 PM - * - */ - -IconSelect.DEFAULT = {}; -IconSelect.DEFAULT.SELECTED_ICON_WIDTH = 48; -IconSelect.DEFAULT.SELECTED_ICON_HEIGHT = 48; -IconSelect.DEFAULT.SELECTED_BOX_PADDING = 1; -IconSelect.DEFAULT.SELECTED_BOX_PADDING_RIGHT = 12; -IconSelect.DEFAULT.ICONS_WIDTH = 32; -IconSelect.DEFAULT.ICONS_HEIGHT = 32; -IconSelect.DEFAULT.BOX_ICON_SPACE = 1; -IconSelect.DEFAULT.HORIZONTAL_ICON_NUMBER = 3; -IconSelect.DEFAULT.VECTORAL_ICON_NUMBER = 3; - -IconSelect.COMPONENT_ICON_FILE_PATH = "../javascript/iconselect.js-1.0/images/control/icon-select/arrow.png"; - -function IconSelect($$elementID, $$parameters) { - - var _icons = []; - var _selectedIndex = -1; - var _boxScroll; - - var _default = IconSelect.DEFAULT; - - function _init() { - - //parametreler boş gelirse - if(!$$parameters) $$parameters = {}; - //En üst elementi seç - if(_View.setIconSelectElement($$elementID)){ - - //set parameters - $$parameters = _Model.checkParameters($$parameters); - //create UI - var ui = _View.createUI($$parameters, $$elementID); - //basıldığında göster/gizle - _View.iconSelectElement.onclick = function(){ - _View.showBox(); - }; - - //Başlangıçta gizle - _View.showBox(false); - - //Nesneye basıldığında gizlemeyi iptal et. - _View.iconSelectElement.addEventListener('click', function($event){ - $event.stopPropagation(); - }); - - //dışarı basıldığında gizle. - window.addEventListener('click', function(){ - _View.showBox(false); - }); - - }else{ - alert("Element not found."); - } - - } - - //Tüm iconları yeniden yükle. - this.refresh = function($icons){ - - _icons = []; - - var setSelectedIndex = this.setSelectedIndex; - - for(var i = 0; i < $icons.length; i++){ - $icons[i].element = _View.createIcon($icons[i].iconFilePath, $icons[i].iconValue, i, $$parameters); - $icons[i].element.onclick = function(){ - setSelectedIndex(this.childNodes[0].getAttribute('icon-index')); - - }; - _icons.push($icons[i]); - - } - - var horizontalIconNumber = Math.round(($icons.length) / $$parameters.vectoralIconNumber); - - _View.boxElement.style.height = (($$parameters.iconsHeight + 2) * horizontalIconNumber) + - ((horizontalIconNumber + 1) * $$parameters.boxIconSpace); - this.setSelectedIndex(0); - - }; - - //icon listesini al. - this.getIcons = function(){ return _icons; }; - - //iconu seçili hale gelir. - this.setSelectedIndex = function($index){ - - var icon; - - if(_icons.length > $index) - icon = _icons[$index]; - - if(icon){ - //eski icondan seçilme özelliğini kaldır. - if(_selectedIndex != -1) _icons[_selectedIndex].element.setAttribute('class','icon'); - _selectedIndex = $index; - _View.selectedIconImgElement.setAttribute('src', icon.iconFilePath); - if(_selectedIndex != -1) _icons[_selectedIndex].element.setAttribute('class','icon selected'); - if(_selectedIndex != -1) $('#profimg').attr("src","../imgs/my-icons-collection-128px/png/" + icon.iconValue + ".png"); - } - - _View.iconSelectElement.dispatchEvent(new Event('changed')); - - //_View.showBox(false); - - }; - - this.getSelectedIndex = function(){ return _selectedIndex; }; - this.getSelectedValue = function(){ return _icons[_selectedIndex].iconValue }; - this.getSelectedFilePath = function(){ return _icons[_selectedIndex].iconFilePath }; - - - - //### VIEW CLASS ### - - function _View(){} - - _View.iconSelectElement; - _View.boxElement; - _View.boxScrollElement; - _View.selectedIconImgElement; - _View.selectedIconElement; - - _View.showBox = function($isShown){ - - if($isShown == null) { - $isShown = (_View.boxElement.style.display == "none") ? true : false; - } - - if($isShown) { - _View.boxElement.style.display = "block"; - _View.boxScrollElement.style.display = "block"; - _boxScroll = (_boxScroll) ? _boxScroll : new iScroll($$elementID + "-box-scroll"); - }else{ - _View.boxElement.style.display = "none"; - _View.boxScrollElement.style.display = "none"; - } - - _View.boxElement.style.display = ($isShown) ? "block" : "none"; - - - - }; - - _View.setIconSelectElement = function($elementID){ - _View.iconSelectElement = document.getElementById($elementID); - return _View.iconSelectElement; - }; - - _View.clearUI = function(){ - _View.iconSelectElement.innerHTML = ""; - }; - - _View.clearIcons = function(){ - _View.boxElement.innerHTML = ""; - }; - - _View.createUI = function($parameters){ - - /* HTML MODEL - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - */ - - _View.clearUI(); - - _View.iconSelectElement.setAttribute('class', 'icon-select'); - - var selectedBoxElement = document.createElement('div'); - selectedBoxElement.setAttribute('class' ,'selected-box'); - - var selectedIconElement = document.createElement('div'); - selectedIconElement.setAttribute('class' ,'selected-icon'); - - _View.selectedIconImgElement = document.createElement('img'); - _View.selectedIconImgElement.setAttribute('src', ''); - selectedIconElement.appendChild(_View.selectedIconImgElement); - - var componentIconElement = document.createElement('div'); - componentIconElement.setAttribute('class', 'component-icon'); - - var componentIconImgElement = document.createElement('img'); - componentIconImgElement.setAttribute('src', IconSelect.COMPONENT_ICON_FILE_PATH ); - componentIconElement.appendChild(componentIconImgElement); - - _View.boxScrollElement = document.createElement('div'); - _View.boxScrollElement.setAttribute('id',$$elementID + "-box-scroll"); - _View.boxScrollElement.setAttribute('class', 'box'); - - _View.boxElement = document.createElement('div'); - - //_View.boxElement.setAttribute('class', 'box'); - _View.boxScrollElement.appendChild(_View.boxElement); - - _View.selectedIconImgElement.setAttribute('width', $parameters.selectedIconWidth); - _View.selectedIconImgElement.setAttribute('height', $parameters.selectedIconHeight); - selectedIconElement.style.width = $parameters.selectedIconWidth; - selectedIconElement.style.height = $parameters.selectedIconHeight; - selectedBoxElement.style.width = $parameters.selectedIconWidth + $parameters.selectedBoxPadding + $parameters.selectedBoxPaddingRight; - selectedBoxElement.style.height = $parameters.selectedIconHeight + ($parameters.selectedBoxPadding * 2); - selectedIconElement.style.top = $parameters.selectedBoxPadding; - selectedIconElement.style.left = $parameters.selectedBoxPadding; - componentIconElement.style.bottom = 4 + $parameters.selectedBoxPadding; - - _View.boxScrollElement.style.left = parseInt(selectedBoxElement.style.width) + 1; - - _View.boxScrollElement.style.width = (($parameters.iconsWidth + 2) * $parameters.vectoralIconNumber) + - (($parameters.vectoralIconNumber + 1) * $parameters.boxIconSpace); - _View.boxScrollElement.style.height = (($parameters.iconsHeight + 2) * $parameters.horizontalIconNumber) + - (($parameters.horizontalIconNumber + 1) * $parameters.boxIconSpace); - - _View.boxElement.style.left = _View.boxScrollElement.style.left; - _View.boxElement.style.width = _View.boxScrollElement.style.width; - - _View.iconSelectElement.appendChild(selectedBoxElement); - selectedBoxElement.appendChild(selectedIconElement); - selectedBoxElement.appendChild(componentIconElement); - selectedBoxElement.appendChild(_View.boxScrollElement); - - - var results = {}; - results['iconSelectElement'] = _View.iconSelectElement; - results['selectedBoxElement'] = selectedBoxElement; - results['selectedIconElement'] = selectedIconElement; - results['selectedIconImgElement'] = _View.selectedIconImgElement; - results['componentIconElement'] = componentIconElement; - results['componentIconImgElement'] = componentIconImgElement; - - return results; - - - //trigger: created ( run setValues ) - - }; - - _View.createIcon = function($iconFilePath, $iconValue, $index, $parameters){ - - /* HTML MODEL - -
- - */ - - var iconElement = document.createElement('div'); - iconElement.setAttribute('class', 'icon'); - iconElement.style.width = $parameters.iconsWidth; - iconElement.style.height = $parameters.iconsHeight; - iconElement.style.marginLeft = $parameters.boxIconSpace; - iconElement.style.marginTop = $parameters.boxIconSpace; - - var iconImgElement = document.createElement('img'); - iconImgElement.setAttribute('src', $iconFilePath); - iconImgElement.setAttribute('icon-value', $iconValue); - iconImgElement.setAttribute('icon-index', $index); - iconImgElement.setAttribute('width', $parameters.iconsWidth); - iconImgElement.setAttribute('height', $parameters.iconsHeight); - - iconElement.appendChild(iconImgElement); - _View.boxElement.appendChild(iconElement); - - return iconElement; - - }; - - //### MODEL CLASS ### - - function _Model(){} - - //TODO: params değişkenini kaldır yeni oluştursun. - _Model.checkParameters = function($parameters){ - - $parameters.selectedIconWidth = ($parameters.selectedIconWidth) ? $parameters.selectedIconWidth : _default.SELECTED_ICON_WIDTH; - $parameters.selectedIconHeight = ($parameters.selectedIconHeight) ? $parameters.selectedIconHeight : _default.SELECTED_ICON_HEIGHT; - $parameters.selectedBoxPadding = ($parameters.selectedBoxPadding) ? $parameters.selectedBoxPadding : _default.SELECTED_BOX_PADDING; - $parameters.selectedBoxPaddingRight = ($parameters.selectedBoxPaddingRight) ? $parameters.selectedBoxPaddingRight : _default.SELECTED_BOX_PADDING_RIGHT; - $parameters.iconsWidth = ($parameters.iconsWidth) ? $parameters.iconsWidth : _default.ICONS_WIDTH; - $parameters.iconsHeight = ($parameters.iconsHeight) ? $parameters.iconsHeight : _default.ICONS_HEIGHT; - $parameters.boxIconSpace = ($parameters.boxIconSpace) ? $parameters.boxIconSpace : _default.BOX_ICON_SPACE; - $parameters.vectoralIconNumber = ($parameters.vectoralIconNumber) ? $parameters.vectoralIconNumber : _default.VECTORAL_ICON_NUMBER; - $parameters.horizontalIconNumber = ($parameters.horizontalIconNumber) ? $parameters.horizontalIconNumber : _default.HORIZONTAL_ICON_NUMBER; - - return $parameters; - - }; - - _init(); + +/** + * + * Created with NetBeans IDE + * + * Code : Icon Select JS + * Version : 1.0 + * + * User : Bugra OZDEN + * Site : http://www.bugraozden.com + * Mail : bugra.ozden@gmail.com + * + * Date : 10/30/13 + * Time : 01:10 PM + * + */ + +IconSelect.DEFAULT = {}; +IconSelect.DEFAULT.SELECTED_ICON_WIDTH = 48; +IconSelect.DEFAULT.SELECTED_ICON_HEIGHT = 48; +IconSelect.DEFAULT.SELECTED_BOX_PADDING = 1; +IconSelect.DEFAULT.SELECTED_BOX_PADDING_RIGHT = 12; +IconSelect.DEFAULT.ICONS_WIDTH = 32; +IconSelect.DEFAULT.ICONS_HEIGHT = 32; +IconSelect.DEFAULT.BOX_ICON_SPACE = 1; +IconSelect.DEFAULT.HORIZONTAL_ICON_NUMBER = 3; +IconSelect.DEFAULT.VECTORAL_ICON_NUMBER = 3; + +IconSelect.COMPONENT_ICON_FILE_PATH = "../javascript/iconselect.js-1.0/images/control/icon-select/arrow.png"; + +function IconSelect($$elementID, $$parameters) { + + var _icons = []; + var _selectedIndex = -1; + var _boxScroll; + + var _default = IconSelect.DEFAULT; + + function _init() { + + //parametreler boş gelirse + if(!$$parameters) $$parameters = {}; + //En üst elementi seç + if(_View.setIconSelectElement($$elementID)){ + + //set parameters + $$parameters = _Model.checkParameters($$parameters); + //create UI + var ui = _View.createUI($$parameters, $$elementID); + //basıldığında göster/gizle + _View.iconSelectElement.onclick = function(){ + _View.showBox(); + }; + + //Başlangıçta gizle + _View.showBox(false); + + //Nesneye basıldığında gizlemeyi iptal et. + _View.iconSelectElement.addEventListener('click', function($event){ + $event.stopPropagation(); + }); + + //dışarı basıldığında gizle. + window.addEventListener('click', function(){ + _View.showBox(false); + }); + + }else{ + alert("Element not found."); + } + + } + + //Tüm iconları yeniden yükle. + this.refresh = function($icons){ + + _icons = []; + + var setSelectedIndex = this.setSelectedIndex; + + for(var i = 0; i < $icons.length; i++){ + $icons[i].element = _View.createIcon($icons[i].iconFilePath, $icons[i].iconValue, i, $$parameters); + $icons[i].element.onclick = function(){ + setSelectedIndex(this.childNodes[0].getAttribute('icon-index')); + + }; + _icons.push($icons[i]); + + } + + var horizontalIconNumber = Math.round(($icons.length) / $$parameters.vectoralIconNumber); + + _View.boxElement.style.height = (($$parameters.iconsHeight + 2) * horizontalIconNumber) + + ((horizontalIconNumber + 1) * $$parameters.boxIconSpace); + this.setSelectedIndex(0); + + }; + + //icon listesini al. + this.getIcons = function(){ return _icons; }; + + //iconu seçili hale gelir. + this.setSelectedIndex = function($index){ + + var icon; + + if(_icons.length > $index) + icon = _icons[$index]; + + if(icon){ + //eski icondan seçilme özelliğini kaldır. + if(_selectedIndex != -1) _icons[_selectedIndex].element.setAttribute('class','icon'); + _selectedIndex = $index; + _View.selectedIconImgElement.setAttribute('src', icon.iconFilePath); + if(_selectedIndex != -1) _icons[_selectedIndex].element.setAttribute('class','icon selected'); + if(_selectedIndex != -1) $('#profimg').attr("src","../imgs/my-icons-collection-128px/png/" + icon.iconValue + ".png"); + } + + _View.iconSelectElement.dispatchEvent(new Event('changed')); + + //_View.showBox(false); + + }; + + this.getSelectedIndex = function(){ return _selectedIndex; }; + this.getSelectedValue = function(){ return _icons[_selectedIndex].iconValue }; + this.getSelectedFilePath = function(){ return _icons[_selectedIndex].iconFilePath }; + + + + //### VIEW CLASS ### + + function _View(){} + + _View.iconSelectElement; + _View.boxElement; + _View.boxScrollElement; + _View.selectedIconImgElement; + _View.selectedIconElement; + + _View.showBox = function($isShown){ + + if($isShown == null) { + $isShown = (_View.boxElement.style.display == "none") ? true : false; + } + + if($isShown) { + _View.boxElement.style.display = "block"; + _View.boxScrollElement.style.display = "block"; + _boxScroll = (_boxScroll) ? _boxScroll : new iScroll($$elementID + "-box-scroll"); + }else{ + _View.boxElement.style.display = "none"; + _View.boxScrollElement.style.display = "none"; + } + + _View.boxElement.style.display = ($isShown) ? "block" : "none"; + + + + }; + + _View.setIconSelectElement = function($elementID){ + _View.iconSelectElement = document.getElementById($elementID); + return _View.iconSelectElement; + }; + + _View.clearUI = function(){ + _View.iconSelectElement.innerHTML = ""; + }; + + _View.clearIcons = function(){ + _View.boxElement.innerHTML = ""; + }; + + _View.createUI = function($parameters){ + + /* HTML MODEL + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + */ + + _View.clearUI(); + + _View.iconSelectElement.setAttribute('class', 'icon-select'); + + var selectedBoxElement = document.createElement('div'); + selectedBoxElement.setAttribute('class' ,'selected-box'); + + var selectedIconElement = document.createElement('div'); + selectedIconElement.setAttribute('class' ,'selected-icon'); + + _View.selectedIconImgElement = document.createElement('img'); + _View.selectedIconImgElement.setAttribute('src', ''); + selectedIconElement.appendChild(_View.selectedIconImgElement); + + var componentIconElement = document.createElement('div'); + componentIconElement.setAttribute('class', 'component-icon'); + + var componentIconImgElement = document.createElement('img'); + componentIconImgElement.setAttribute('src', IconSelect.COMPONENT_ICON_FILE_PATH ); + componentIconElement.appendChild(componentIconImgElement); + + _View.boxScrollElement = document.createElement('div'); + _View.boxScrollElement.setAttribute('id',$$elementID + "-box-scroll"); + _View.boxScrollElement.setAttribute('class', 'box'); + + _View.boxElement = document.createElement('div'); + + //_View.boxElement.setAttribute('class', 'box'); + _View.boxScrollElement.appendChild(_View.boxElement); + + _View.selectedIconImgElement.setAttribute('width', $parameters.selectedIconWidth); + _View.selectedIconImgElement.setAttribute('height', $parameters.selectedIconHeight); + selectedIconElement.style.width = $parameters.selectedIconWidth; + selectedIconElement.style.height = $parameters.selectedIconHeight; + selectedBoxElement.style.width = $parameters.selectedIconWidth + $parameters.selectedBoxPadding + $parameters.selectedBoxPaddingRight; + selectedBoxElement.style.height = $parameters.selectedIconHeight + ($parameters.selectedBoxPadding * 2); + selectedIconElement.style.top = $parameters.selectedBoxPadding; + selectedIconElement.style.left = $parameters.selectedBoxPadding; + componentIconElement.style.bottom = 4 + $parameters.selectedBoxPadding; + + _View.boxScrollElement.style.left = parseInt(selectedBoxElement.style.width) + 1; + + _View.boxScrollElement.style.width = (($parameters.iconsWidth + 2) * $parameters.vectoralIconNumber) + + (($parameters.vectoralIconNumber + 1) * $parameters.boxIconSpace); + _View.boxScrollElement.style.height = (($parameters.iconsHeight + 2) * $parameters.horizontalIconNumber) + + (($parameters.horizontalIconNumber + 1) * $parameters.boxIconSpace); + + _View.boxElement.style.left = _View.boxScrollElement.style.left; + _View.boxElement.style.width = _View.boxScrollElement.style.width; + + _View.iconSelectElement.appendChild(selectedBoxElement); + selectedBoxElement.appendChild(selectedIconElement); + selectedBoxElement.appendChild(componentIconElement); + selectedBoxElement.appendChild(_View.boxScrollElement); + + + var results = {}; + results['iconSelectElement'] = _View.iconSelectElement; + results['selectedBoxElement'] = selectedBoxElement; + results['selectedIconElement'] = selectedIconElement; + results['selectedIconImgElement'] = _View.selectedIconImgElement; + results['componentIconElement'] = componentIconElement; + results['componentIconImgElement'] = componentIconImgElement; + + return results; + + + //trigger: created ( run setValues ) + + }; + + _View.createIcon = function($iconFilePath, $iconValue, $index, $parameters){ + + /* HTML MODEL + +
+ + */ + + var iconElement = document.createElement('div'); + iconElement.setAttribute('class', 'icon'); + iconElement.style.width = $parameters.iconsWidth; + iconElement.style.height = $parameters.iconsHeight; + iconElement.style.marginLeft = $parameters.boxIconSpace; + iconElement.style.marginTop = $parameters.boxIconSpace; + + var iconImgElement = document.createElement('img'); + iconImgElement.setAttribute('src', $iconFilePath); + iconImgElement.setAttribute('icon-value', $iconValue); + iconImgElement.setAttribute('icon-index', $index); + iconImgElement.setAttribute('width', $parameters.iconsWidth); + iconImgElement.setAttribute('height', $parameters.iconsHeight); + + iconElement.appendChild(iconImgElement); + _View.boxElement.appendChild(iconElement); + + return iconElement; + + }; + + //### MODEL CLASS ### + + function _Model(){} + + //TODO: params değişkenini kaldır yeni oluştursun. + _Model.checkParameters = function($parameters){ + + $parameters.selectedIconWidth = ($parameters.selectedIconWidth) ? $parameters.selectedIconWidth : _default.SELECTED_ICON_WIDTH; + $parameters.selectedIconHeight = ($parameters.selectedIconHeight) ? $parameters.selectedIconHeight : _default.SELECTED_ICON_HEIGHT; + $parameters.selectedBoxPadding = ($parameters.selectedBoxPadding) ? $parameters.selectedBoxPadding : _default.SELECTED_BOX_PADDING; + $parameters.selectedBoxPaddingRight = ($parameters.selectedBoxPaddingRight) ? $parameters.selectedBoxPaddingRight : _default.SELECTED_BOX_PADDING_RIGHT; + $parameters.iconsWidth = ($parameters.iconsWidth) ? $parameters.iconsWidth : _default.ICONS_WIDTH; + $parameters.iconsHeight = ($parameters.iconsHeight) ? $parameters.iconsHeight : _default.ICONS_HEIGHT; + $parameters.boxIconSpace = ($parameters.boxIconSpace) ? $parameters.boxIconSpace : _default.BOX_ICON_SPACE; + $parameters.vectoralIconNumber = ($parameters.vectoralIconNumber) ? $parameters.vectoralIconNumber : _default.VECTORAL_ICON_NUMBER; + $parameters.horizontalIconNumber = ($parameters.horizontalIconNumber) ? $parameters.horizontalIconNumber : _default.HORIZONTAL_ICON_NUMBER; + + return $parameters; + + }; + + _init(); } \ No newline at end of file diff --git a/WebContent/html/javascript/iconselect.js-1.0/lib/iscroll-license.txt b/WebContent/html/javascript/iconselect.js-1.0/lib/iscroll-license.txt index 1c54a54..bbdd0ab 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/lib/iscroll-license.txt +++ b/WebContent/html/javascript/iconselect.js-1.0/lib/iscroll-license.txt @@ -1,22 +1,22 @@ -Copyright (c) 2012 Matteo Spinelli, http://cubiq.org/ - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +Copyright (c) 2012 Matteo Spinelli, http://cubiq.org/ + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/WebContent/html/javascript/iconselect.js-1.0/lib/iscroll.js b/WebContent/html/javascript/iconselect.js-1.0/lib/iscroll.js index 8222de0..702434f 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/lib/iscroll.js +++ b/WebContent/html/javascript/iconselect.js-1.0/lib/iscroll.js @@ -1,1104 +1,1104 @@ -/*! - * iScroll v4.2.5 ~ Copyright (c) 2012 Matteo Spinelli, http://cubiq.org - * Released under MIT license, http://cubiq.org/license - */ -(function(window, doc){ -var m = Math, - dummyStyle = doc.createElement('div').style, - vendor = (function () { - var vendors = 't,webkitT,MozT,msT,OT'.split(','), - t, - i = 0, - l = vendors.length; - - for ( ; i < l; i++ ) { - t = vendors[i] + 'ransform'; - if ( t in dummyStyle ) { - return vendors[i].substr(0, vendors[i].length - 1); - } - } - - return false; - })(), - cssVendor = vendor ? '-' + vendor.toLowerCase() + '-' : '', - - // Style properties - transform = prefixStyle('transform'), - transitionProperty = prefixStyle('transitionProperty'), - transitionDuration = prefixStyle('transitionDuration'), - transformOrigin = prefixStyle('transformOrigin'), - transitionTimingFunction = prefixStyle('transitionTimingFunction'), - transitionDelay = prefixStyle('transitionDelay'), - - // Browser capabilities - isAndroid = (/android/gi).test(navigator.appVersion), - isIDevice = (/iphone|ipad/gi).test(navigator.appVersion), - isTouchPad = (/hp-tablet/gi).test(navigator.appVersion), - - has3d = prefixStyle('perspective') in dummyStyle, - hasTouch = 'ontouchstart' in window && !isTouchPad, - hasTransform = vendor !== false, - hasTransitionEnd = prefixStyle('transition') in dummyStyle, - - RESIZE_EV = 'onorientationchange' in window ? 'orientationchange' : 'resize', - START_EV = hasTouch ? 'touchstart' : 'mousedown', - MOVE_EV = hasTouch ? 'touchmove' : 'mousemove', - END_EV = hasTouch ? 'touchend' : 'mouseup', - CANCEL_EV = hasTouch ? 'touchcancel' : 'mouseup', - TRNEND_EV = (function () { - if ( vendor === false ) return false; - - var transitionEnd = { - '' : 'transitionend', - 'webkit' : 'webkitTransitionEnd', - 'Moz' : 'transitionend', - 'O' : 'otransitionend', - 'ms' : 'MSTransitionEnd' - }; - - return transitionEnd[vendor]; - })(), - - nextFrame = (function() { - return window.requestAnimationFrame || - window.webkitRequestAnimationFrame || - window.mozRequestAnimationFrame || - window.oRequestAnimationFrame || - window.msRequestAnimationFrame || - function(callback) { return setTimeout(callback, 1); }; - })(), - cancelFrame = (function () { - return window.cancelRequestAnimationFrame || - window.webkitCancelAnimationFrame || - window.webkitCancelRequestAnimationFrame || - window.mozCancelRequestAnimationFrame || - window.oCancelRequestAnimationFrame || - window.msCancelRequestAnimationFrame || - clearTimeout; - })(), - - // Helpers - translateZ = has3d ? ' translateZ(0)' : '', - - // Constructor - iScroll = function (el, options) { - var that = this, - i; - - that.wrapper = typeof el == 'object' ? el : doc.getElementById(el); - that.wrapper.style.overflow = 'hidden'; - that.scroller = that.wrapper.children[0]; - - // Default options - that.options = { - hScroll: true, - vScroll: true, - x: 0, - y: 0, - bounce: true, - bounceLock: false, - momentum: true, - lockDirection: true, - useTransform: true, - useTransition: false, - topOffset: 0, - checkDOMChanges: false, // Experimental - handleClick: true, - - // Scrollbar - hScrollbar: true, - vScrollbar: true, - fixedScrollbar: isAndroid, - hideScrollbar: isIDevice, - fadeScrollbar: isIDevice && has3d, - scrollbarClass: '', - - // Zoom - zoom: false, - zoomMin: 1, - zoomMax: 4, - doubleTapZoom: 2, - wheelAction: 'scroll', - - // Snap - snap: false, - snapThreshold: 1, - - // Events - onRefresh: null, - onBeforeScrollStart: function (e) { e.preventDefault(); }, - onScrollStart: null, - onBeforeScrollMove: null, - onScrollMove: null, - onBeforeScrollEnd: null, - onScrollEnd: null, - onTouchEnd: null, - onDestroy: null, - onZoomStart: null, - onZoom: null, - onZoomEnd: null - }; - - // User defined options - for (i in options) that.options[i] = options[i]; - - // Set starting position - that.x = that.options.x; - that.y = that.options.y; - - // Normalize options - that.options.useTransform = hasTransform && that.options.useTransform; - that.options.hScrollbar = that.options.hScroll && that.options.hScrollbar; - that.options.vScrollbar = that.options.vScroll && that.options.vScrollbar; - that.options.zoom = that.options.useTransform && that.options.zoom; - that.options.useTransition = hasTransitionEnd && that.options.useTransition; - - // Helpers FIX ANDROID BUG! - // translate3d and scale doesn't work together! - // Ignoring 3d ONLY WHEN YOU SET that.options.zoom - if ( that.options.zoom && isAndroid ){ - translateZ = ''; - } - - // Set some default styles - that.scroller.style[transitionProperty] = that.options.useTransform ? cssVendor + 'transform' : 'top left'; - that.scroller.style[transitionDuration] = '0'; - that.scroller.style[transformOrigin] = '0 0'; - if (that.options.useTransition) that.scroller.style[transitionTimingFunction] = 'cubic-bezier(0.33,0.66,0.66,1)'; - - if (that.options.useTransform) that.scroller.style[transform] = 'translate(' + that.x + 'px,' + that.y + 'px)' + translateZ; - else that.scroller.style.cssText += ';position:absolute;top:' + that.y + 'px;left:' + that.x + 'px'; - - if (that.options.useTransition) that.options.fixedScrollbar = true; - - that.refresh(); - - that._bind(RESIZE_EV, window); - that._bind(START_EV); - if (!hasTouch) { - if (that.options.wheelAction != 'none') { - that._bind('DOMMouseScroll'); - that._bind('mousewheel'); - } - } - - if (that.options.checkDOMChanges) that.checkDOMTime = setInterval(function () { - that._checkDOMChanges(); - }, 500); - }; - -// Prototype -iScroll.prototype = { - enabled: true, - x: 0, - y: 0, - steps: [], - scale: 1, - currPageX: 0, currPageY: 0, - pagesX: [], pagesY: [], - aniTime: null, - wheelZoomCount: 0, - - handleEvent: function (e) { - var that = this; - switch(e.type) { - case START_EV: - if (!hasTouch && e.button !== 0) return; - that._start(e); - break; - case MOVE_EV: that._move(e); break; - case END_EV: - case CANCEL_EV: that._end(e); break; - case RESIZE_EV: that._resize(); break; - case 'DOMMouseScroll': case 'mousewheel': that._wheel(e); break; - case TRNEND_EV: that._transitionEnd(e); break; - } - }, - - _checkDOMChanges: function () { - if (this.moved || this.zoomed || this.animating || - (this.scrollerW == this.scroller.offsetWidth * this.scale && this.scrollerH == this.scroller.offsetHeight * this.scale)) return; - - this.refresh(); - }, - - _scrollbar: function (dir) { - var that = this, - bar; - - if (!that[dir + 'Scrollbar']) { - if (that[dir + 'ScrollbarWrapper']) { - if (hasTransform) that[dir + 'ScrollbarIndicator'].style[transform] = ''; - that[dir + 'ScrollbarWrapper'].parentNode.removeChild(that[dir + 'ScrollbarWrapper']); - that[dir + 'ScrollbarWrapper'] = null; - that[dir + 'ScrollbarIndicator'] = null; - } - - return; - } - - if (!that[dir + 'ScrollbarWrapper']) { - // Create the scrollbar wrapper - bar = doc.createElement('div'); - - if (that.options.scrollbarClass) bar.className = that.options.scrollbarClass + dir.toUpperCase(); - else bar.style.cssText = 'position:absolute;z-index:100;' + (dir == 'h' ? 'height:7px;bottom:1px;left:2px;right:' + (that.vScrollbar ? '7' : '2') + 'px' : 'width:7px;bottom:' + (that.hScrollbar ? '7' : '2') + 'px;top:2px;right:1px'); - - bar.style.cssText += ';pointer-events:none;' + cssVendor + 'transition-property:opacity;' + cssVendor + 'transition-duration:' + (that.options.fadeScrollbar ? '350ms' : '0') + ';overflow:hidden;opacity:' + (that.options.hideScrollbar ? '0' : '1'); - - that.wrapper.appendChild(bar); - that[dir + 'ScrollbarWrapper'] = bar; - - // Create the scrollbar indicator - bar = doc.createElement('div'); - if (!that.options.scrollbarClass) { - bar.style.cssText = 'position:absolute;z-index:100;background:rgba(0,0,0,0.5);border:1px solid rgba(255,255,255,0.9);' + cssVendor + 'background-clip:padding-box;' + cssVendor + 'box-sizing:border-box;' + (dir == 'h' ? 'height:100%' : 'width:100%') + ';' + cssVendor + 'border-radius:3px;border-radius:3px'; - } - bar.style.cssText += ';pointer-events:none;' + cssVendor + 'transition-property:' + cssVendor + 'transform;' + cssVendor + 'transition-timing-function:cubic-bezier(0.33,0.66,0.66,1);' + cssVendor + 'transition-duration:0;' + cssVendor + 'transform: translate(0,0)' + translateZ; - if (that.options.useTransition) bar.style.cssText += ';' + cssVendor + 'transition-timing-function:cubic-bezier(0.33,0.66,0.66,1)'; - - that[dir + 'ScrollbarWrapper'].appendChild(bar); - that[dir + 'ScrollbarIndicator'] = bar; - } - - if (dir == 'h') { - that.hScrollbarSize = that.hScrollbarWrapper.clientWidth; - that.hScrollbarIndicatorSize = m.max(m.round(that.hScrollbarSize * that.hScrollbarSize / that.scrollerW), 8); - that.hScrollbarIndicator.style.width = that.hScrollbarIndicatorSize + 'px'; - that.hScrollbarMaxScroll = that.hScrollbarSize - that.hScrollbarIndicatorSize; - that.hScrollbarProp = that.hScrollbarMaxScroll / that.maxScrollX; - } else { - that.vScrollbarSize = that.vScrollbarWrapper.clientHeight; - that.vScrollbarIndicatorSize = m.max(m.round(that.vScrollbarSize * that.vScrollbarSize / that.scrollerH), 8); - that.vScrollbarIndicator.style.height = that.vScrollbarIndicatorSize + 'px'; - that.vScrollbarMaxScroll = that.vScrollbarSize - that.vScrollbarIndicatorSize; - that.vScrollbarProp = that.vScrollbarMaxScroll / that.maxScrollY; - } - - // Reset position - that._scrollbarPos(dir, true); - }, - - _resize: function () { - var that = this; - setTimeout(function () { that.refresh(); }, isAndroid ? 200 : 0); - }, - - _pos: function (x, y) { - if (this.zoomed) return; - - x = this.hScroll ? x : 0; - y = this.vScroll ? y : 0; - - if (this.options.useTransform) { - this.scroller.style[transform] = 'translate(' + x + 'px,' + y + 'px) scale(' + this.scale + ')' + translateZ; - } else { - x = m.round(x); - y = m.round(y); - this.scroller.style.left = x + 'px'; - this.scroller.style.top = y + 'px'; - } - - this.x = x; - this.y = y; - - this._scrollbarPos('h'); - this._scrollbarPos('v'); - }, - - _scrollbarPos: function (dir, hidden) { - var that = this, - pos = dir == 'h' ? that.x : that.y, - size; - - if (!that[dir + 'Scrollbar']) return; - - pos = that[dir + 'ScrollbarProp'] * pos; - - if (pos < 0) { - if (!that.options.fixedScrollbar) { - size = that[dir + 'ScrollbarIndicatorSize'] + m.round(pos * 3); - if (size < 8) size = 8; - that[dir + 'ScrollbarIndicator'].style[dir == 'h' ? 'width' : 'height'] = size + 'px'; - } - pos = 0; - } else if (pos > that[dir + 'ScrollbarMaxScroll']) { - if (!that.options.fixedScrollbar) { - size = that[dir + 'ScrollbarIndicatorSize'] - m.round((pos - that[dir + 'ScrollbarMaxScroll']) * 3); - if (size < 8) size = 8; - that[dir + 'ScrollbarIndicator'].style[dir == 'h' ? 'width' : 'height'] = size + 'px'; - pos = that[dir + 'ScrollbarMaxScroll'] + (that[dir + 'ScrollbarIndicatorSize'] - size); - } else { - pos = that[dir + 'ScrollbarMaxScroll']; - } - } - - that[dir + 'ScrollbarWrapper'].style[transitionDelay] = '0'; - that[dir + 'ScrollbarWrapper'].style.opacity = hidden && that.options.hideScrollbar ? '0' : '1'; - that[dir + 'ScrollbarIndicator'].style[transform] = 'translate(' + (dir == 'h' ? pos + 'px,0)' : '0,' + pos + 'px)') + translateZ; - }, - - _start: function (e) { - var that = this, - point = hasTouch ? e.touches[0] : e, - matrix, x, y, - c1, c2; - - if (!that.enabled) return; - - if (that.options.onBeforeScrollStart) that.options.onBeforeScrollStart.call(that, e); - - if (that.options.useTransition || that.options.zoom) that._transitionTime(0); - - that.moved = false; - that.animating = false; - that.zoomed = false; - that.distX = 0; - that.distY = 0; - that.absDistX = 0; - that.absDistY = 0; - that.dirX = 0; - that.dirY = 0; - - // Gesture start - if (that.options.zoom && hasTouch && e.touches.length > 1) { - c1 = m.abs(e.touches[0].pageX-e.touches[1].pageX); - c2 = m.abs(e.touches[0].pageY-e.touches[1].pageY); - that.touchesDistStart = m.sqrt(c1 * c1 + c2 * c2); - - that.originX = m.abs(e.touches[0].pageX + e.touches[1].pageX - that.wrapperOffsetLeft * 2) / 2 - that.x; - that.originY = m.abs(e.touches[0].pageY + e.touches[1].pageY - that.wrapperOffsetTop * 2) / 2 - that.y; - - if (that.options.onZoomStart) that.options.onZoomStart.call(that, e); - } - - if (that.options.momentum) { - if (that.options.useTransform) { - // Very lame general purpose alternative to CSSMatrix - matrix = getComputedStyle(that.scroller, null)[transform].replace(/[^0-9\-.,]/g, '').split(','); - x = +(matrix[12] || matrix[4]); - y = +(matrix[13] || matrix[5]); - } else { - x = +getComputedStyle(that.scroller, null).left.replace(/[^0-9-]/g, ''); - y = +getComputedStyle(that.scroller, null).top.replace(/[^0-9-]/g, ''); - } - - if (x != that.x || y != that.y) { - if (that.options.useTransition) that._unbind(TRNEND_EV); - else cancelFrame(that.aniTime); - that.steps = []; - that._pos(x, y); - if (that.options.onScrollEnd) that.options.onScrollEnd.call(that); - } - } - - that.absStartX = that.x; // Needed by snap threshold - that.absStartY = that.y; - - that.startX = that.x; - that.startY = that.y; - that.pointX = point.pageX; - that.pointY = point.pageY; - - that.startTime = e.timeStamp || Date.now(); - - if (that.options.onScrollStart) that.options.onScrollStart.call(that, e); - - that._bind(MOVE_EV, window); - that._bind(END_EV, window); - that._bind(CANCEL_EV, window); - }, - - _move: function (e) { - var that = this, - point = hasTouch ? e.touches[0] : e, - deltaX = point.pageX - that.pointX, - deltaY = point.pageY - that.pointY, - newX = that.x + deltaX, - newY = that.y + deltaY, - c1, c2, scale, - timestamp = e.timeStamp || Date.now(); - - if (that.options.onBeforeScrollMove) that.options.onBeforeScrollMove.call(that, e); - - // Zoom - if (that.options.zoom && hasTouch && e.touches.length > 1) { - c1 = m.abs(e.touches[0].pageX - e.touches[1].pageX); - c2 = m.abs(e.touches[0].pageY - e.touches[1].pageY); - that.touchesDist = m.sqrt(c1*c1+c2*c2); - - that.zoomed = true; - - scale = 1 / that.touchesDistStart * that.touchesDist * this.scale; - - if (scale < that.options.zoomMin) scale = 0.5 * that.options.zoomMin * Math.pow(2.0, scale / that.options.zoomMin); - else if (scale > that.options.zoomMax) scale = 2.0 * that.options.zoomMax * Math.pow(0.5, that.options.zoomMax / scale); - - that.lastScale = scale / this.scale; - - newX = this.originX - this.originX * that.lastScale + this.x; - newY = this.originY - this.originY * that.lastScale + this.y; - - this.scroller.style[transform] = 'translate(' + newX + 'px,' + newY + 'px) scale(' + scale + ')' + translateZ; - - if (that.options.onZoom) that.options.onZoom.call(that, e); - return; - } - - that.pointX = point.pageX; - that.pointY = point.pageY; - - // Slow down if outside of the boundaries - if (newX > 0 || newX < that.maxScrollX) { - newX = that.options.bounce ? that.x + (deltaX / 2) : newX >= 0 || that.maxScrollX >= 0 ? 0 : that.maxScrollX; - } - if (newY > that.minScrollY || newY < that.maxScrollY) { - newY = that.options.bounce ? that.y + (deltaY / 2) : newY >= that.minScrollY || that.maxScrollY >= 0 ? that.minScrollY : that.maxScrollY; - } - - that.distX += deltaX; - that.distY += deltaY; - that.absDistX = m.abs(that.distX); - that.absDistY = m.abs(that.distY); - - if (that.absDistX < 6 && that.absDistY < 6) { - return; - } - - // Lock direction - if (that.options.lockDirection) { - if (that.absDistX > that.absDistY + 5) { - newY = that.y; - deltaY = 0; - } else if (that.absDistY > that.absDistX + 5) { - newX = that.x; - deltaX = 0; - } - } - - that.moved = true; - that._pos(newX, newY); - that.dirX = deltaX > 0 ? -1 : deltaX < 0 ? 1 : 0; - that.dirY = deltaY > 0 ? -1 : deltaY < 0 ? 1 : 0; - - if (timestamp - that.startTime > 300) { - that.startTime = timestamp; - that.startX = that.x; - that.startY = that.y; - } - - if (that.options.onScrollMove) that.options.onScrollMove.call(that, e); - }, - - _end: function (e) { - if (hasTouch && e.touches.length !== 0) return; - - var that = this, - point = hasTouch ? e.changedTouches[0] : e, - target, ev, - momentumX = { dist:0, time:0 }, - momentumY = { dist:0, time:0 }, - duration = (e.timeStamp || Date.now()) - that.startTime, - newPosX = that.x, - newPosY = that.y, - distX, distY, - newDuration, - snap, - scale; - - that._unbind(MOVE_EV, window); - that._unbind(END_EV, window); - that._unbind(CANCEL_EV, window); - - if (that.options.onBeforeScrollEnd) that.options.onBeforeScrollEnd.call(that, e); - - if (that.zoomed) { - scale = that.scale * that.lastScale; - scale = Math.max(that.options.zoomMin, scale); - scale = Math.min(that.options.zoomMax, scale); - that.lastScale = scale / that.scale; - that.scale = scale; - - that.x = that.originX - that.originX * that.lastScale + that.x; - that.y = that.originY - that.originY * that.lastScale + that.y; - - that.scroller.style[transitionDuration] = '200ms'; - that.scroller.style[transform] = 'translate(' + that.x + 'px,' + that.y + 'px) scale(' + that.scale + ')' + translateZ; - - that.zoomed = false; - that.refresh(); - - if (that.options.onZoomEnd) that.options.onZoomEnd.call(that, e); - return; - } - - if (!that.moved) { - if (hasTouch) { - if (that.doubleTapTimer && that.options.zoom) { - // Double tapped - clearTimeout(that.doubleTapTimer); - that.doubleTapTimer = null; - if (that.options.onZoomStart) that.options.onZoomStart.call(that, e); - that.zoom(that.pointX, that.pointY, that.scale == 1 ? that.options.doubleTapZoom : 1); - if (that.options.onZoomEnd) { - setTimeout(function() { - that.options.onZoomEnd.call(that, e); - }, 200); // 200 is default zoom duration - } - } else if (this.options.handleClick) { - that.doubleTapTimer = setTimeout(function () { - that.doubleTapTimer = null; - - // Find the last touched element - target = point.target; - while (target.nodeType != 1) target = target.parentNode; - - if (target.tagName != 'SELECT' && target.tagName != 'INPUT' && target.tagName != 'TEXTAREA') { - ev = doc.createEvent('MouseEvents'); - ev.initMouseEvent('click', true, true, e.view, 1, - point.screenX, point.screenY, point.clientX, point.clientY, - e.ctrlKey, e.altKey, e.shiftKey, e.metaKey, - 0, null); - ev._fake = true; - target.dispatchEvent(ev); - } - }, that.options.zoom ? 250 : 0); - } - } - - that._resetPos(400); - - if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e); - return; - } - - if (duration < 300 && that.options.momentum) { - momentumX = newPosX ? that._momentum(newPosX - that.startX, duration, -that.x, that.scrollerW - that.wrapperW + that.x, that.options.bounce ? that.wrapperW : 0) : momentumX; - momentumY = newPosY ? that._momentum(newPosY - that.startY, duration, -that.y, (that.maxScrollY < 0 ? that.scrollerH - that.wrapperH + that.y - that.minScrollY : 0), that.options.bounce ? that.wrapperH : 0) : momentumY; - - newPosX = that.x + momentumX.dist; - newPosY = that.y + momentumY.dist; - - if ((that.x > 0 && newPosX > 0) || (that.x < that.maxScrollX && newPosX < that.maxScrollX)) momentumX = { dist:0, time:0 }; - if ((that.y > that.minScrollY && newPosY > that.minScrollY) || (that.y < that.maxScrollY && newPosY < that.maxScrollY)) momentumY = { dist:0, time:0 }; - } - - if (momentumX.dist || momentumY.dist) { - newDuration = m.max(m.max(momentumX.time, momentumY.time), 10); - - // Do we need to snap? - if (that.options.snap) { - distX = newPosX - that.absStartX; - distY = newPosY - that.absStartY; - if (m.abs(distX) < that.options.snapThreshold && m.abs(distY) < that.options.snapThreshold) { that.scrollTo(that.absStartX, that.absStartY, 200); } - else { - snap = that._snap(newPosX, newPosY); - newPosX = snap.x; - newPosY = snap.y; - newDuration = m.max(snap.time, newDuration); - } - } - - that.scrollTo(m.round(newPosX), m.round(newPosY), newDuration); - - if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e); - return; - } - - // Do we need to snap? - if (that.options.snap) { - distX = newPosX - that.absStartX; - distY = newPosY - that.absStartY; - if (m.abs(distX) < that.options.snapThreshold && m.abs(distY) < that.options.snapThreshold) that.scrollTo(that.absStartX, that.absStartY, 200); - else { - snap = that._snap(that.x, that.y); - if (snap.x != that.x || snap.y != that.y) that.scrollTo(snap.x, snap.y, snap.time); - } - - if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e); - return; - } - - that._resetPos(200); - if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e); - }, - - _resetPos: function (time) { - var that = this, - resetX = that.x >= 0 ? 0 : that.x < that.maxScrollX ? that.maxScrollX : that.x, - resetY = that.y >= that.minScrollY || that.maxScrollY > 0 ? that.minScrollY : that.y < that.maxScrollY ? that.maxScrollY : that.y; - - if (resetX == that.x && resetY == that.y) { - if (that.moved) { - that.moved = false; - if (that.options.onScrollEnd) that.options.onScrollEnd.call(that); // Execute custom code on scroll end - } - - if (that.hScrollbar && that.options.hideScrollbar) { - if (vendor == 'webkit') that.hScrollbarWrapper.style[transitionDelay] = '300ms'; - that.hScrollbarWrapper.style.opacity = '0'; - } - if (that.vScrollbar && that.options.hideScrollbar) { - if (vendor == 'webkit') that.vScrollbarWrapper.style[transitionDelay] = '300ms'; - that.vScrollbarWrapper.style.opacity = '0'; - } - - return; - } - - that.scrollTo(resetX, resetY, time || 0); - }, - - _wheel: function (e) { - var that = this, - wheelDeltaX, wheelDeltaY, - deltaX, deltaY, - deltaScale; - - if ('wheelDeltaX' in e) { - wheelDeltaX = e.wheelDeltaX / 12; - wheelDeltaY = e.wheelDeltaY / 12; - } else if('wheelDelta' in e) { - wheelDeltaX = wheelDeltaY = e.wheelDelta / 12; - } else if ('detail' in e) { - wheelDeltaX = wheelDeltaY = -e.detail * 3; - } else { - return; - } - - if (that.options.wheelAction == 'zoom') { - deltaScale = that.scale * Math.pow(2, 1/3 * (wheelDeltaY ? wheelDeltaY / Math.abs(wheelDeltaY) : 0)); - if (deltaScale < that.options.zoomMin) deltaScale = that.options.zoomMin; - if (deltaScale > that.options.zoomMax) deltaScale = that.options.zoomMax; - - if (deltaScale != that.scale) { - if (!that.wheelZoomCount && that.options.onZoomStart) that.options.onZoomStart.call(that, e); - that.wheelZoomCount++; - - that.zoom(e.pageX, e.pageY, deltaScale, 400); - - setTimeout(function() { - that.wheelZoomCount--; - if (!that.wheelZoomCount && that.options.onZoomEnd) that.options.onZoomEnd.call(that, e); - }, 400); - } - - return; - } - - deltaX = that.x + wheelDeltaX; - deltaY = that.y + wheelDeltaY; - - if (deltaX > 0) deltaX = 0; - else if (deltaX < that.maxScrollX) deltaX = that.maxScrollX; - - if (deltaY > that.minScrollY) deltaY = that.minScrollY; - else if (deltaY < that.maxScrollY) deltaY = that.maxScrollY; - - if (that.maxScrollY < 0) { - that.scrollTo(deltaX, deltaY, 0); - } - }, - - _transitionEnd: function (e) { - var that = this; - - if (e.target != that.scroller) return; - - that._unbind(TRNEND_EV); - - that._startAni(); - }, - - - /** - * - * Utilities - * - */ - _startAni: function () { - var that = this, - startX = that.x, startY = that.y, - startTime = Date.now(), - step, easeOut, - animate; - - if (that.animating) return; - - if (!that.steps.length) { - that._resetPos(400); - return; - } - - step = that.steps.shift(); - - if (step.x == startX && step.y == startY) step.time = 0; - - that.animating = true; - that.moved = true; - - if (that.options.useTransition) { - that._transitionTime(step.time); - that._pos(step.x, step.y); - that.animating = false; - if (step.time) that._bind(TRNEND_EV); - else that._resetPos(0); - return; - } - - animate = function () { - var now = Date.now(), - newX, newY; - - if (now >= startTime + step.time) { - that._pos(step.x, step.y); - that.animating = false; - if (that.options.onAnimationEnd) that.options.onAnimationEnd.call(that); // Execute custom code on animation end - that._startAni(); - return; - } - - now = (now - startTime) / step.time - 1; - easeOut = m.sqrt(1 - now * now); - newX = (step.x - startX) * easeOut + startX; - newY = (step.y - startY) * easeOut + startY; - that._pos(newX, newY); - if (that.animating) that.aniTime = nextFrame(animate); - }; - - animate(); - }, - - _transitionTime: function (time) { - time += 'ms'; - this.scroller.style[transitionDuration] = time; - if (this.hScrollbar) this.hScrollbarIndicator.style[transitionDuration] = time; - if (this.vScrollbar) this.vScrollbarIndicator.style[transitionDuration] = time; - }, - - _momentum: function (dist, time, maxDistUpper, maxDistLower, size) { - var deceleration = 0.0006, - speed = m.abs(dist) / time, - newDist = (speed * speed) / (2 * deceleration), - newTime = 0, outsideDist = 0; - - // Proportinally reduce speed if we are outside of the boundaries - if (dist > 0 && newDist > maxDistUpper) { - outsideDist = size / (6 / (newDist / speed * deceleration)); - maxDistUpper = maxDistUpper + outsideDist; - speed = speed * maxDistUpper / newDist; - newDist = maxDistUpper; - } else if (dist < 0 && newDist > maxDistLower) { - outsideDist = size / (6 / (newDist / speed * deceleration)); - maxDistLower = maxDistLower + outsideDist; - speed = speed * maxDistLower / newDist; - newDist = maxDistLower; - } - - newDist = newDist * (dist < 0 ? -1 : 1); - newTime = speed / deceleration; - - return { dist: newDist, time: m.round(newTime) }; - }, - - _offset: function (el) { - var left = -el.offsetLeft, - top = -el.offsetTop; - - while (el = el.offsetParent) { - left -= el.offsetLeft; - top -= el.offsetTop; - } - - if (el != this.wrapper) { - left *= this.scale; - top *= this.scale; - } - - return { left: left, top: top }; - }, - - _snap: function (x, y) { - var that = this, - i, l, - page, time, - sizeX, sizeY; - - // Check page X - page = that.pagesX.length - 1; - for (i=0, l=that.pagesX.length; i= that.pagesX[i]) { - page = i; - break; - } - } - if (page == that.currPageX && page > 0 && that.dirX < 0) page--; - x = that.pagesX[page]; - sizeX = m.abs(x - that.pagesX[that.currPageX]); - sizeX = sizeX ? m.abs(that.x - x) / sizeX * 500 : 0; - that.currPageX = page; - - // Check page Y - page = that.pagesY.length-1; - for (i=0; i= that.pagesY[i]) { - page = i; - break; - } - } - if (page == that.currPageY && page > 0 && that.dirY < 0) page--; - y = that.pagesY[page]; - sizeY = m.abs(y - that.pagesY[that.currPageY]); - sizeY = sizeY ? m.abs(that.y - y) / sizeY * 500 : 0; - that.currPageY = page; - - // Snap with constant speed (proportional duration) - time = m.round(m.max(sizeX, sizeY)) || 200; - - return { x: x, y: y, time: time }; - }, - - _bind: function (type, el, bubble) { - (el || this.scroller).addEventListener(type, this, !!bubble); - }, - - _unbind: function (type, el, bubble) { - (el || this.scroller).removeEventListener(type, this, !!bubble); - }, - - - /** - * - * Public methods - * - */ - destroy: function () { - var that = this; - - that.scroller.style[transform] = ''; - - // Remove the scrollbars - that.hScrollbar = false; - that.vScrollbar = false; - that._scrollbar('h'); - that._scrollbar('v'); - - // Remove the event listeners - that._unbind(RESIZE_EV, window); - that._unbind(START_EV); - that._unbind(MOVE_EV, window); - that._unbind(END_EV, window); - that._unbind(CANCEL_EV, window); - - if (!that.options.hasTouch) { - that._unbind('DOMMouseScroll'); - that._unbind('mousewheel'); - } - - if (that.options.useTransition) that._unbind(TRNEND_EV); - - if (that.options.checkDOMChanges) clearInterval(that.checkDOMTime); - - if (that.options.onDestroy) that.options.onDestroy.call(that); - }, - - refresh: function () { - var that = this, - offset, - i, l, - els, - pos = 0, - page = 0; - - if (that.scale < that.options.zoomMin) that.scale = that.options.zoomMin; - that.wrapperW = that.wrapper.clientWidth || 1; - that.wrapperH = that.wrapper.clientHeight || 1; - - that.minScrollY = -that.options.topOffset || 0; - that.scrollerW = m.round(that.scroller.offsetWidth * that.scale); - that.scrollerH = m.round((that.scroller.offsetHeight + that.minScrollY) * that.scale); - that.maxScrollX = that.wrapperW - that.scrollerW; - that.maxScrollY = that.wrapperH - that.scrollerH + that.minScrollY; - that.dirX = 0; - that.dirY = 0; - - if (that.options.onRefresh) that.options.onRefresh.call(that); - - that.hScroll = that.options.hScroll && that.maxScrollX < 0; - that.vScroll = that.options.vScroll && (!that.options.bounceLock && !that.hScroll || that.scrollerH > that.wrapperH); - - that.hScrollbar = that.hScroll && that.options.hScrollbar; - that.vScrollbar = that.vScroll && that.options.vScrollbar && that.scrollerH > that.wrapperH; - - offset = that._offset(that.wrapper); - that.wrapperOffsetLeft = -offset.left; - that.wrapperOffsetTop = -offset.top; - - // Prepare snap - if (typeof that.options.snap == 'string') { - that.pagesX = []; - that.pagesY = []; - els = that.scroller.querySelectorAll(that.options.snap); - for (i=0, l=els.length; i= that.maxScrollX) { - that.pagesX[page] = pos; - pos = pos - that.wrapperW; - page++; - } - if (that.maxScrollX%that.wrapperW) that.pagesX[that.pagesX.length] = that.maxScrollX - that.pagesX[that.pagesX.length-1] + that.pagesX[that.pagesX.length-1]; - - pos = 0; - page = 0; - that.pagesY = []; - while (pos >= that.maxScrollY) { - that.pagesY[page] = pos; - pos = pos - that.wrapperH; - page++; - } - if (that.maxScrollY%that.wrapperH) that.pagesY[that.pagesY.length] = that.maxScrollY - that.pagesY[that.pagesY.length-1] + that.pagesY[that.pagesY.length-1]; - } - - // Prepare the scrollbars - that._scrollbar('h'); - that._scrollbar('v'); - - if (!that.zoomed) { - that.scroller.style[transitionDuration] = '0'; - that._resetPos(400); - } - }, - - scrollTo: function (x, y, time, relative) { - var that = this, - step = x, - i, l; - - that.stop(); - - if (!step.length) step = [{ x: x, y: y, time: time, relative: relative }]; - - for (i=0, l=step.length; i 0 ? 0 : pos.left < that.maxScrollX ? that.maxScrollX : pos.left; - pos.top = pos.top > that.minScrollY ? that.minScrollY : pos.top < that.maxScrollY ? that.maxScrollY : pos.top; - time = time === undefined ? m.max(m.abs(pos.left)*2, m.abs(pos.top)*2) : time; - - that.scrollTo(pos.left, pos.top, time); - }, - - scrollToPage: function (pageX, pageY, time) { - var that = this, x, y; - - time = time === undefined ? 400 : time; - - if (that.options.onScrollStart) that.options.onScrollStart.call(that); - - if (that.options.snap) { - pageX = pageX == 'next' ? that.currPageX+1 : pageX == 'prev' ? that.currPageX-1 : pageX; - pageY = pageY == 'next' ? that.currPageY+1 : pageY == 'prev' ? that.currPageY-1 : pageY; - - pageX = pageX < 0 ? 0 : pageX > that.pagesX.length-1 ? that.pagesX.length-1 : pageX; - pageY = pageY < 0 ? 0 : pageY > that.pagesY.length-1 ? that.pagesY.length-1 : pageY; - - that.currPageX = pageX; - that.currPageY = pageY; - x = that.pagesX[pageX]; - y = that.pagesY[pageY]; - } else { - x = -that.wrapperW * pageX; - y = -that.wrapperH * pageY; - if (x < that.maxScrollX) x = that.maxScrollX; - if (y < that.maxScrollY) y = that.maxScrollY; - } - - that.scrollTo(x, y, time); - }, - - disable: function () { - this.stop(); - this._resetPos(0); - this.enabled = false; - - // If disabled after touchstart we make sure that there are no left over events - this._unbind(MOVE_EV, window); - this._unbind(END_EV, window); - this._unbind(CANCEL_EV, window); - }, - - enable: function () { - this.enabled = true; - }, - - stop: function () { - if (this.options.useTransition) this._unbind(TRNEND_EV); - else cancelFrame(this.aniTime); - this.steps = []; - this.moved = false; - this.animating = false; - }, - - zoom: function (x, y, scale, time) { - var that = this, - relScale = scale / that.scale; - - if (!that.options.useTransform) return; - - that.zoomed = true; - time = time === undefined ? 200 : time; - x = x - that.wrapperOffsetLeft - that.x; - y = y - that.wrapperOffsetTop - that.y; - that.x = x - x * relScale + that.x; - that.y = y - y * relScale + that.y; - - that.scale = scale; - that.refresh(); - - that.x = that.x > 0 ? 0 : that.x < that.maxScrollX ? that.maxScrollX : that.x; - that.y = that.y > that.minScrollY ? that.minScrollY : that.y < that.maxScrollY ? that.maxScrollY : that.y; - - that.scroller.style[transitionDuration] = time + 'ms'; - that.scroller.style[transform] = 'translate(' + that.x + 'px,' + that.y + 'px) scale(' + scale + ')' + translateZ; - that.zoomed = false; - }, - - isReady: function () { - return !this.moved && !this.zoomed && !this.animating; - } -}; - -function prefixStyle (style) { - if ( vendor === '' ) return style; - - style = style.charAt(0).toUpperCase() + style.substr(1); - return vendor + style; -} - -dummyStyle = null; // for the sake of it - -if (typeof exports !== 'undefined') exports.iScroll = iScroll; -else window.iScroll = iScroll; - -})(window, document); +/*! + * iScroll v4.2.5 ~ Copyright (c) 2012 Matteo Spinelli, http://cubiq.org + * Released under MIT license, http://cubiq.org/license + */ +(function(window, doc){ +var m = Math, + dummyStyle = doc.createElement('div').style, + vendor = (function () { + var vendors = 't,webkitT,MozT,msT,OT'.split(','), + t, + i = 0, + l = vendors.length; + + for ( ; i < l; i++ ) { + t = vendors[i] + 'ransform'; + if ( t in dummyStyle ) { + return vendors[i].substr(0, vendors[i].length - 1); + } + } + + return false; + })(), + cssVendor = vendor ? '-' + vendor.toLowerCase() + '-' : '', + + // Style properties + transform = prefixStyle('transform'), + transitionProperty = prefixStyle('transitionProperty'), + transitionDuration = prefixStyle('transitionDuration'), + transformOrigin = prefixStyle('transformOrigin'), + transitionTimingFunction = prefixStyle('transitionTimingFunction'), + transitionDelay = prefixStyle('transitionDelay'), + + // Browser capabilities + isAndroid = (/android/gi).test(navigator.appVersion), + isIDevice = (/iphone|ipad/gi).test(navigator.appVersion), + isTouchPad = (/hp-tablet/gi).test(navigator.appVersion), + + has3d = prefixStyle('perspective') in dummyStyle, + hasTouch = 'ontouchstart' in window && !isTouchPad, + hasTransform = vendor !== false, + hasTransitionEnd = prefixStyle('transition') in dummyStyle, + + RESIZE_EV = 'onorientationchange' in window ? 'orientationchange' : 'resize', + START_EV = hasTouch ? 'touchstart' : 'mousedown', + MOVE_EV = hasTouch ? 'touchmove' : 'mousemove', + END_EV = hasTouch ? 'touchend' : 'mouseup', + CANCEL_EV = hasTouch ? 'touchcancel' : 'mouseup', + TRNEND_EV = (function () { + if ( vendor === false ) return false; + + var transitionEnd = { + '' : 'transitionend', + 'webkit' : 'webkitTransitionEnd', + 'Moz' : 'transitionend', + 'O' : 'otransitionend', + 'ms' : 'MSTransitionEnd' + }; + + return transitionEnd[vendor]; + })(), + + nextFrame = (function() { + return window.requestAnimationFrame || + window.webkitRequestAnimationFrame || + window.mozRequestAnimationFrame || + window.oRequestAnimationFrame || + window.msRequestAnimationFrame || + function(callback) { return setTimeout(callback, 1); }; + })(), + cancelFrame = (function () { + return window.cancelRequestAnimationFrame || + window.webkitCancelAnimationFrame || + window.webkitCancelRequestAnimationFrame || + window.mozCancelRequestAnimationFrame || + window.oCancelRequestAnimationFrame || + window.msCancelRequestAnimationFrame || + clearTimeout; + })(), + + // Helpers + translateZ = has3d ? ' translateZ(0)' : '', + + // Constructor + iScroll = function (el, options) { + var that = this, + i; + + that.wrapper = typeof el == 'object' ? el : doc.getElementById(el); + that.wrapper.style.overflow = 'hidden'; + that.scroller = that.wrapper.children[0]; + + // Default options + that.options = { + hScroll: true, + vScroll: true, + x: 0, + y: 0, + bounce: true, + bounceLock: false, + momentum: true, + lockDirection: true, + useTransform: true, + useTransition: false, + topOffset: 0, + checkDOMChanges: false, // Experimental + handleClick: true, + + // Scrollbar + hScrollbar: true, + vScrollbar: true, + fixedScrollbar: isAndroid, + hideScrollbar: isIDevice, + fadeScrollbar: isIDevice && has3d, + scrollbarClass: '', + + // Zoom + zoom: false, + zoomMin: 1, + zoomMax: 4, + doubleTapZoom: 2, + wheelAction: 'scroll', + + // Snap + snap: false, + snapThreshold: 1, + + // Events + onRefresh: null, + onBeforeScrollStart: function (e) { e.preventDefault(); }, + onScrollStart: null, + onBeforeScrollMove: null, + onScrollMove: null, + onBeforeScrollEnd: null, + onScrollEnd: null, + onTouchEnd: null, + onDestroy: null, + onZoomStart: null, + onZoom: null, + onZoomEnd: null + }; + + // User defined options + for (i in options) that.options[i] = options[i]; + + // Set starting position + that.x = that.options.x; + that.y = that.options.y; + + // Normalize options + that.options.useTransform = hasTransform && that.options.useTransform; + that.options.hScrollbar = that.options.hScroll && that.options.hScrollbar; + that.options.vScrollbar = that.options.vScroll && that.options.vScrollbar; + that.options.zoom = that.options.useTransform && that.options.zoom; + that.options.useTransition = hasTransitionEnd && that.options.useTransition; + + // Helpers FIX ANDROID BUG! + // translate3d and scale doesn't work together! + // Ignoring 3d ONLY WHEN YOU SET that.options.zoom + if ( that.options.zoom && isAndroid ){ + translateZ = ''; + } + + // Set some default styles + that.scroller.style[transitionProperty] = that.options.useTransform ? cssVendor + 'transform' : 'top left'; + that.scroller.style[transitionDuration] = '0'; + that.scroller.style[transformOrigin] = '0 0'; + if (that.options.useTransition) that.scroller.style[transitionTimingFunction] = 'cubic-bezier(0.33,0.66,0.66,1)'; + + if (that.options.useTransform) that.scroller.style[transform] = 'translate(' + that.x + 'px,' + that.y + 'px)' + translateZ; + else that.scroller.style.cssText += ';position:absolute;top:' + that.y + 'px;left:' + that.x + 'px'; + + if (that.options.useTransition) that.options.fixedScrollbar = true; + + that.refresh(); + + that._bind(RESIZE_EV, window); + that._bind(START_EV); + if (!hasTouch) { + if (that.options.wheelAction != 'none') { + that._bind('DOMMouseScroll'); + that._bind('mousewheel'); + } + } + + if (that.options.checkDOMChanges) that.checkDOMTime = setInterval(function () { + that._checkDOMChanges(); + }, 500); + }; + +// Prototype +iScroll.prototype = { + enabled: true, + x: 0, + y: 0, + steps: [], + scale: 1, + currPageX: 0, currPageY: 0, + pagesX: [], pagesY: [], + aniTime: null, + wheelZoomCount: 0, + + handleEvent: function (e) { + var that = this; + switch(e.type) { + case START_EV: + if (!hasTouch && e.button !== 0) return; + that._start(e); + break; + case MOVE_EV: that._move(e); break; + case END_EV: + case CANCEL_EV: that._end(e); break; + case RESIZE_EV: that._resize(); break; + case 'DOMMouseScroll': case 'mousewheel': that._wheel(e); break; + case TRNEND_EV: that._transitionEnd(e); break; + } + }, + + _checkDOMChanges: function () { + if (this.moved || this.zoomed || this.animating || + (this.scrollerW == this.scroller.offsetWidth * this.scale && this.scrollerH == this.scroller.offsetHeight * this.scale)) return; + + this.refresh(); + }, + + _scrollbar: function (dir) { + var that = this, + bar; + + if (!that[dir + 'Scrollbar']) { + if (that[dir + 'ScrollbarWrapper']) { + if (hasTransform) that[dir + 'ScrollbarIndicator'].style[transform] = ''; + that[dir + 'ScrollbarWrapper'].parentNode.removeChild(that[dir + 'ScrollbarWrapper']); + that[dir + 'ScrollbarWrapper'] = null; + that[dir + 'ScrollbarIndicator'] = null; + } + + return; + } + + if (!that[dir + 'ScrollbarWrapper']) { + // Create the scrollbar wrapper + bar = doc.createElement('div'); + + if (that.options.scrollbarClass) bar.className = that.options.scrollbarClass + dir.toUpperCase(); + else bar.style.cssText = 'position:absolute;z-index:100;' + (dir == 'h' ? 'height:7px;bottom:1px;left:2px;right:' + (that.vScrollbar ? '7' : '2') + 'px' : 'width:7px;bottom:' + (that.hScrollbar ? '7' : '2') + 'px;top:2px;right:1px'); + + bar.style.cssText += ';pointer-events:none;' + cssVendor + 'transition-property:opacity;' + cssVendor + 'transition-duration:' + (that.options.fadeScrollbar ? '350ms' : '0') + ';overflow:hidden;opacity:' + (that.options.hideScrollbar ? '0' : '1'); + + that.wrapper.appendChild(bar); + that[dir + 'ScrollbarWrapper'] = bar; + + // Create the scrollbar indicator + bar = doc.createElement('div'); + if (!that.options.scrollbarClass) { + bar.style.cssText = 'position:absolute;z-index:100;background:rgba(0,0,0,0.5);border:1px solid rgba(255,255,255,0.9);' + cssVendor + 'background-clip:padding-box;' + cssVendor + 'box-sizing:border-box;' + (dir == 'h' ? 'height:100%' : 'width:100%') + ';' + cssVendor + 'border-radius:3px;border-radius:3px'; + } + bar.style.cssText += ';pointer-events:none;' + cssVendor + 'transition-property:' + cssVendor + 'transform;' + cssVendor + 'transition-timing-function:cubic-bezier(0.33,0.66,0.66,1);' + cssVendor + 'transition-duration:0;' + cssVendor + 'transform: translate(0,0)' + translateZ; + if (that.options.useTransition) bar.style.cssText += ';' + cssVendor + 'transition-timing-function:cubic-bezier(0.33,0.66,0.66,1)'; + + that[dir + 'ScrollbarWrapper'].appendChild(bar); + that[dir + 'ScrollbarIndicator'] = bar; + } + + if (dir == 'h') { + that.hScrollbarSize = that.hScrollbarWrapper.clientWidth; + that.hScrollbarIndicatorSize = m.max(m.round(that.hScrollbarSize * that.hScrollbarSize / that.scrollerW), 8); + that.hScrollbarIndicator.style.width = that.hScrollbarIndicatorSize + 'px'; + that.hScrollbarMaxScroll = that.hScrollbarSize - that.hScrollbarIndicatorSize; + that.hScrollbarProp = that.hScrollbarMaxScroll / that.maxScrollX; + } else { + that.vScrollbarSize = that.vScrollbarWrapper.clientHeight; + that.vScrollbarIndicatorSize = m.max(m.round(that.vScrollbarSize * that.vScrollbarSize / that.scrollerH), 8); + that.vScrollbarIndicator.style.height = that.vScrollbarIndicatorSize + 'px'; + that.vScrollbarMaxScroll = that.vScrollbarSize - that.vScrollbarIndicatorSize; + that.vScrollbarProp = that.vScrollbarMaxScroll / that.maxScrollY; + } + + // Reset position + that._scrollbarPos(dir, true); + }, + + _resize: function () { + var that = this; + setTimeout(function () { that.refresh(); }, isAndroid ? 200 : 0); + }, + + _pos: function (x, y) { + if (this.zoomed) return; + + x = this.hScroll ? x : 0; + y = this.vScroll ? y : 0; + + if (this.options.useTransform) { + this.scroller.style[transform] = 'translate(' + x + 'px,' + y + 'px) scale(' + this.scale + ')' + translateZ; + } else { + x = m.round(x); + y = m.round(y); + this.scroller.style.left = x + 'px'; + this.scroller.style.top = y + 'px'; + } + + this.x = x; + this.y = y; + + this._scrollbarPos('h'); + this._scrollbarPos('v'); + }, + + _scrollbarPos: function (dir, hidden) { + var that = this, + pos = dir == 'h' ? that.x : that.y, + size; + + if (!that[dir + 'Scrollbar']) return; + + pos = that[dir + 'ScrollbarProp'] * pos; + + if (pos < 0) { + if (!that.options.fixedScrollbar) { + size = that[dir + 'ScrollbarIndicatorSize'] + m.round(pos * 3); + if (size < 8) size = 8; + that[dir + 'ScrollbarIndicator'].style[dir == 'h' ? 'width' : 'height'] = size + 'px'; + } + pos = 0; + } else if (pos > that[dir + 'ScrollbarMaxScroll']) { + if (!that.options.fixedScrollbar) { + size = that[dir + 'ScrollbarIndicatorSize'] - m.round((pos - that[dir + 'ScrollbarMaxScroll']) * 3); + if (size < 8) size = 8; + that[dir + 'ScrollbarIndicator'].style[dir == 'h' ? 'width' : 'height'] = size + 'px'; + pos = that[dir + 'ScrollbarMaxScroll'] + (that[dir + 'ScrollbarIndicatorSize'] - size); + } else { + pos = that[dir + 'ScrollbarMaxScroll']; + } + } + + that[dir + 'ScrollbarWrapper'].style[transitionDelay] = '0'; + that[dir + 'ScrollbarWrapper'].style.opacity = hidden && that.options.hideScrollbar ? '0' : '1'; + that[dir + 'ScrollbarIndicator'].style[transform] = 'translate(' + (dir == 'h' ? pos + 'px,0)' : '0,' + pos + 'px)') + translateZ; + }, + + _start: function (e) { + var that = this, + point = hasTouch ? e.touches[0] : e, + matrix, x, y, + c1, c2; + + if (!that.enabled) return; + + if (that.options.onBeforeScrollStart) that.options.onBeforeScrollStart.call(that, e); + + if (that.options.useTransition || that.options.zoom) that._transitionTime(0); + + that.moved = false; + that.animating = false; + that.zoomed = false; + that.distX = 0; + that.distY = 0; + that.absDistX = 0; + that.absDistY = 0; + that.dirX = 0; + that.dirY = 0; + + // Gesture start + if (that.options.zoom && hasTouch && e.touches.length > 1) { + c1 = m.abs(e.touches[0].pageX-e.touches[1].pageX); + c2 = m.abs(e.touches[0].pageY-e.touches[1].pageY); + that.touchesDistStart = m.sqrt(c1 * c1 + c2 * c2); + + that.originX = m.abs(e.touches[0].pageX + e.touches[1].pageX - that.wrapperOffsetLeft * 2) / 2 - that.x; + that.originY = m.abs(e.touches[0].pageY + e.touches[1].pageY - that.wrapperOffsetTop * 2) / 2 - that.y; + + if (that.options.onZoomStart) that.options.onZoomStart.call(that, e); + } + + if (that.options.momentum) { + if (that.options.useTransform) { + // Very lame general purpose alternative to CSSMatrix + matrix = getComputedStyle(that.scroller, null)[transform].replace(/[^0-9\-.,]/g, '').split(','); + x = +(matrix[12] || matrix[4]); + y = +(matrix[13] || matrix[5]); + } else { + x = +getComputedStyle(that.scroller, null).left.replace(/[^0-9-]/g, ''); + y = +getComputedStyle(that.scroller, null).top.replace(/[^0-9-]/g, ''); + } + + if (x != that.x || y != that.y) { + if (that.options.useTransition) that._unbind(TRNEND_EV); + else cancelFrame(that.aniTime); + that.steps = []; + that._pos(x, y); + if (that.options.onScrollEnd) that.options.onScrollEnd.call(that); + } + } + + that.absStartX = that.x; // Needed by snap threshold + that.absStartY = that.y; + + that.startX = that.x; + that.startY = that.y; + that.pointX = point.pageX; + that.pointY = point.pageY; + + that.startTime = e.timeStamp || Date.now(); + + if (that.options.onScrollStart) that.options.onScrollStart.call(that, e); + + that._bind(MOVE_EV, window); + that._bind(END_EV, window); + that._bind(CANCEL_EV, window); + }, + + _move: function (e) { + var that = this, + point = hasTouch ? e.touches[0] : e, + deltaX = point.pageX - that.pointX, + deltaY = point.pageY - that.pointY, + newX = that.x + deltaX, + newY = that.y + deltaY, + c1, c2, scale, + timestamp = e.timeStamp || Date.now(); + + if (that.options.onBeforeScrollMove) that.options.onBeforeScrollMove.call(that, e); + + // Zoom + if (that.options.zoom && hasTouch && e.touches.length > 1) { + c1 = m.abs(e.touches[0].pageX - e.touches[1].pageX); + c2 = m.abs(e.touches[0].pageY - e.touches[1].pageY); + that.touchesDist = m.sqrt(c1*c1+c2*c2); + + that.zoomed = true; + + scale = 1 / that.touchesDistStart * that.touchesDist * this.scale; + + if (scale < that.options.zoomMin) scale = 0.5 * that.options.zoomMin * Math.pow(2.0, scale / that.options.zoomMin); + else if (scale > that.options.zoomMax) scale = 2.0 * that.options.zoomMax * Math.pow(0.5, that.options.zoomMax / scale); + + that.lastScale = scale / this.scale; + + newX = this.originX - this.originX * that.lastScale + this.x; + newY = this.originY - this.originY * that.lastScale + this.y; + + this.scroller.style[transform] = 'translate(' + newX + 'px,' + newY + 'px) scale(' + scale + ')' + translateZ; + + if (that.options.onZoom) that.options.onZoom.call(that, e); + return; + } + + that.pointX = point.pageX; + that.pointY = point.pageY; + + // Slow down if outside of the boundaries + if (newX > 0 || newX < that.maxScrollX) { + newX = that.options.bounce ? that.x + (deltaX / 2) : newX >= 0 || that.maxScrollX >= 0 ? 0 : that.maxScrollX; + } + if (newY > that.minScrollY || newY < that.maxScrollY) { + newY = that.options.bounce ? that.y + (deltaY / 2) : newY >= that.minScrollY || that.maxScrollY >= 0 ? that.minScrollY : that.maxScrollY; + } + + that.distX += deltaX; + that.distY += deltaY; + that.absDistX = m.abs(that.distX); + that.absDistY = m.abs(that.distY); + + if (that.absDistX < 6 && that.absDistY < 6) { + return; + } + + // Lock direction + if (that.options.lockDirection) { + if (that.absDistX > that.absDistY + 5) { + newY = that.y; + deltaY = 0; + } else if (that.absDistY > that.absDistX + 5) { + newX = that.x; + deltaX = 0; + } + } + + that.moved = true; + that._pos(newX, newY); + that.dirX = deltaX > 0 ? -1 : deltaX < 0 ? 1 : 0; + that.dirY = deltaY > 0 ? -1 : deltaY < 0 ? 1 : 0; + + if (timestamp - that.startTime > 300) { + that.startTime = timestamp; + that.startX = that.x; + that.startY = that.y; + } + + if (that.options.onScrollMove) that.options.onScrollMove.call(that, e); + }, + + _end: function (e) { + if (hasTouch && e.touches.length !== 0) return; + + var that = this, + point = hasTouch ? e.changedTouches[0] : e, + target, ev, + momentumX = { dist:0, time:0 }, + momentumY = { dist:0, time:0 }, + duration = (e.timeStamp || Date.now()) - that.startTime, + newPosX = that.x, + newPosY = that.y, + distX, distY, + newDuration, + snap, + scale; + + that._unbind(MOVE_EV, window); + that._unbind(END_EV, window); + that._unbind(CANCEL_EV, window); + + if (that.options.onBeforeScrollEnd) that.options.onBeforeScrollEnd.call(that, e); + + if (that.zoomed) { + scale = that.scale * that.lastScale; + scale = Math.max(that.options.zoomMin, scale); + scale = Math.min(that.options.zoomMax, scale); + that.lastScale = scale / that.scale; + that.scale = scale; + + that.x = that.originX - that.originX * that.lastScale + that.x; + that.y = that.originY - that.originY * that.lastScale + that.y; + + that.scroller.style[transitionDuration] = '200ms'; + that.scroller.style[transform] = 'translate(' + that.x + 'px,' + that.y + 'px) scale(' + that.scale + ')' + translateZ; + + that.zoomed = false; + that.refresh(); + + if (that.options.onZoomEnd) that.options.onZoomEnd.call(that, e); + return; + } + + if (!that.moved) { + if (hasTouch) { + if (that.doubleTapTimer && that.options.zoom) { + // Double tapped + clearTimeout(that.doubleTapTimer); + that.doubleTapTimer = null; + if (that.options.onZoomStart) that.options.onZoomStart.call(that, e); + that.zoom(that.pointX, that.pointY, that.scale == 1 ? that.options.doubleTapZoom : 1); + if (that.options.onZoomEnd) { + setTimeout(function() { + that.options.onZoomEnd.call(that, e); + }, 200); // 200 is default zoom duration + } + } else if (this.options.handleClick) { + that.doubleTapTimer = setTimeout(function () { + that.doubleTapTimer = null; + + // Find the last touched element + target = point.target; + while (target.nodeType != 1) target = target.parentNode; + + if (target.tagName != 'SELECT' && target.tagName != 'INPUT' && target.tagName != 'TEXTAREA') { + ev = doc.createEvent('MouseEvents'); + ev.initMouseEvent('click', true, true, e.view, 1, + point.screenX, point.screenY, point.clientX, point.clientY, + e.ctrlKey, e.altKey, e.shiftKey, e.metaKey, + 0, null); + ev._fake = true; + target.dispatchEvent(ev); + } + }, that.options.zoom ? 250 : 0); + } + } + + that._resetPos(400); + + if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e); + return; + } + + if (duration < 300 && that.options.momentum) { + momentumX = newPosX ? that._momentum(newPosX - that.startX, duration, -that.x, that.scrollerW - that.wrapperW + that.x, that.options.bounce ? that.wrapperW : 0) : momentumX; + momentumY = newPosY ? that._momentum(newPosY - that.startY, duration, -that.y, (that.maxScrollY < 0 ? that.scrollerH - that.wrapperH + that.y - that.minScrollY : 0), that.options.bounce ? that.wrapperH : 0) : momentumY; + + newPosX = that.x + momentumX.dist; + newPosY = that.y + momentumY.dist; + + if ((that.x > 0 && newPosX > 0) || (that.x < that.maxScrollX && newPosX < that.maxScrollX)) momentumX = { dist:0, time:0 }; + if ((that.y > that.minScrollY && newPosY > that.minScrollY) || (that.y < that.maxScrollY && newPosY < that.maxScrollY)) momentumY = { dist:0, time:0 }; + } + + if (momentumX.dist || momentumY.dist) { + newDuration = m.max(m.max(momentumX.time, momentumY.time), 10); + + // Do we need to snap? + if (that.options.snap) { + distX = newPosX - that.absStartX; + distY = newPosY - that.absStartY; + if (m.abs(distX) < that.options.snapThreshold && m.abs(distY) < that.options.snapThreshold) { that.scrollTo(that.absStartX, that.absStartY, 200); } + else { + snap = that._snap(newPosX, newPosY); + newPosX = snap.x; + newPosY = snap.y; + newDuration = m.max(snap.time, newDuration); + } + } + + that.scrollTo(m.round(newPosX), m.round(newPosY), newDuration); + + if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e); + return; + } + + // Do we need to snap? + if (that.options.snap) { + distX = newPosX - that.absStartX; + distY = newPosY - that.absStartY; + if (m.abs(distX) < that.options.snapThreshold && m.abs(distY) < that.options.snapThreshold) that.scrollTo(that.absStartX, that.absStartY, 200); + else { + snap = that._snap(that.x, that.y); + if (snap.x != that.x || snap.y != that.y) that.scrollTo(snap.x, snap.y, snap.time); + } + + if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e); + return; + } + + that._resetPos(200); + if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e); + }, + + _resetPos: function (time) { + var that = this, + resetX = that.x >= 0 ? 0 : that.x < that.maxScrollX ? that.maxScrollX : that.x, + resetY = that.y >= that.minScrollY || that.maxScrollY > 0 ? that.minScrollY : that.y < that.maxScrollY ? that.maxScrollY : that.y; + + if (resetX == that.x && resetY == that.y) { + if (that.moved) { + that.moved = false; + if (that.options.onScrollEnd) that.options.onScrollEnd.call(that); // Execute custom code on scroll end + } + + if (that.hScrollbar && that.options.hideScrollbar) { + if (vendor == 'webkit') that.hScrollbarWrapper.style[transitionDelay] = '300ms'; + that.hScrollbarWrapper.style.opacity = '0'; + } + if (that.vScrollbar && that.options.hideScrollbar) { + if (vendor == 'webkit') that.vScrollbarWrapper.style[transitionDelay] = '300ms'; + that.vScrollbarWrapper.style.opacity = '0'; + } + + return; + } + + that.scrollTo(resetX, resetY, time || 0); + }, + + _wheel: function (e) { + var that = this, + wheelDeltaX, wheelDeltaY, + deltaX, deltaY, + deltaScale; + + if ('wheelDeltaX' in e) { + wheelDeltaX = e.wheelDeltaX / 12; + wheelDeltaY = e.wheelDeltaY / 12; + } else if('wheelDelta' in e) { + wheelDeltaX = wheelDeltaY = e.wheelDelta / 12; + } else if ('detail' in e) { + wheelDeltaX = wheelDeltaY = -e.detail * 3; + } else { + return; + } + + if (that.options.wheelAction == 'zoom') { + deltaScale = that.scale * Math.pow(2, 1/3 * (wheelDeltaY ? wheelDeltaY / Math.abs(wheelDeltaY) : 0)); + if (deltaScale < that.options.zoomMin) deltaScale = that.options.zoomMin; + if (deltaScale > that.options.zoomMax) deltaScale = that.options.zoomMax; + + if (deltaScale != that.scale) { + if (!that.wheelZoomCount && that.options.onZoomStart) that.options.onZoomStart.call(that, e); + that.wheelZoomCount++; + + that.zoom(e.pageX, e.pageY, deltaScale, 400); + + setTimeout(function() { + that.wheelZoomCount--; + if (!that.wheelZoomCount && that.options.onZoomEnd) that.options.onZoomEnd.call(that, e); + }, 400); + } + + return; + } + + deltaX = that.x + wheelDeltaX; + deltaY = that.y + wheelDeltaY; + + if (deltaX > 0) deltaX = 0; + else if (deltaX < that.maxScrollX) deltaX = that.maxScrollX; + + if (deltaY > that.minScrollY) deltaY = that.minScrollY; + else if (deltaY < that.maxScrollY) deltaY = that.maxScrollY; + + if (that.maxScrollY < 0) { + that.scrollTo(deltaX, deltaY, 0); + } + }, + + _transitionEnd: function (e) { + var that = this; + + if (e.target != that.scroller) return; + + that._unbind(TRNEND_EV); + + that._startAni(); + }, + + + /** + * + * Utilities + * + */ + _startAni: function () { + var that = this, + startX = that.x, startY = that.y, + startTime = Date.now(), + step, easeOut, + animate; + + if (that.animating) return; + + if (!that.steps.length) { + that._resetPos(400); + return; + } + + step = that.steps.shift(); + + if (step.x == startX && step.y == startY) step.time = 0; + + that.animating = true; + that.moved = true; + + if (that.options.useTransition) { + that._transitionTime(step.time); + that._pos(step.x, step.y); + that.animating = false; + if (step.time) that._bind(TRNEND_EV); + else that._resetPos(0); + return; + } + + animate = function () { + var now = Date.now(), + newX, newY; + + if (now >= startTime + step.time) { + that._pos(step.x, step.y); + that.animating = false; + if (that.options.onAnimationEnd) that.options.onAnimationEnd.call(that); // Execute custom code on animation end + that._startAni(); + return; + } + + now = (now - startTime) / step.time - 1; + easeOut = m.sqrt(1 - now * now); + newX = (step.x - startX) * easeOut + startX; + newY = (step.y - startY) * easeOut + startY; + that._pos(newX, newY); + if (that.animating) that.aniTime = nextFrame(animate); + }; + + animate(); + }, + + _transitionTime: function (time) { + time += 'ms'; + this.scroller.style[transitionDuration] = time; + if (this.hScrollbar) this.hScrollbarIndicator.style[transitionDuration] = time; + if (this.vScrollbar) this.vScrollbarIndicator.style[transitionDuration] = time; + }, + + _momentum: function (dist, time, maxDistUpper, maxDistLower, size) { + var deceleration = 0.0006, + speed = m.abs(dist) / time, + newDist = (speed * speed) / (2 * deceleration), + newTime = 0, outsideDist = 0; + + // Proportinally reduce speed if we are outside of the boundaries + if (dist > 0 && newDist > maxDistUpper) { + outsideDist = size / (6 / (newDist / speed * deceleration)); + maxDistUpper = maxDistUpper + outsideDist; + speed = speed * maxDistUpper / newDist; + newDist = maxDistUpper; + } else if (dist < 0 && newDist > maxDistLower) { + outsideDist = size / (6 / (newDist / speed * deceleration)); + maxDistLower = maxDistLower + outsideDist; + speed = speed * maxDistLower / newDist; + newDist = maxDistLower; + } + + newDist = newDist * (dist < 0 ? -1 : 1); + newTime = speed / deceleration; + + return { dist: newDist, time: m.round(newTime) }; + }, + + _offset: function (el) { + var left = -el.offsetLeft, + top = -el.offsetTop; + + while (el = el.offsetParent) { + left -= el.offsetLeft; + top -= el.offsetTop; + } + + if (el != this.wrapper) { + left *= this.scale; + top *= this.scale; + } + + return { left: left, top: top }; + }, + + _snap: function (x, y) { + var that = this, + i, l, + page, time, + sizeX, sizeY; + + // Check page X + page = that.pagesX.length - 1; + for (i=0, l=that.pagesX.length; i= that.pagesX[i]) { + page = i; + break; + } + } + if (page == that.currPageX && page > 0 && that.dirX < 0) page--; + x = that.pagesX[page]; + sizeX = m.abs(x - that.pagesX[that.currPageX]); + sizeX = sizeX ? m.abs(that.x - x) / sizeX * 500 : 0; + that.currPageX = page; + + // Check page Y + page = that.pagesY.length-1; + for (i=0; i= that.pagesY[i]) { + page = i; + break; + } + } + if (page == that.currPageY && page > 0 && that.dirY < 0) page--; + y = that.pagesY[page]; + sizeY = m.abs(y - that.pagesY[that.currPageY]); + sizeY = sizeY ? m.abs(that.y - y) / sizeY * 500 : 0; + that.currPageY = page; + + // Snap with constant speed (proportional duration) + time = m.round(m.max(sizeX, sizeY)) || 200; + + return { x: x, y: y, time: time }; + }, + + _bind: function (type, el, bubble) { + (el || this.scroller).addEventListener(type, this, !!bubble); + }, + + _unbind: function (type, el, bubble) { + (el || this.scroller).removeEventListener(type, this, !!bubble); + }, + + + /** + * + * Public methods + * + */ + destroy: function () { + var that = this; + + that.scroller.style[transform] = ''; + + // Remove the scrollbars + that.hScrollbar = false; + that.vScrollbar = false; + that._scrollbar('h'); + that._scrollbar('v'); + + // Remove the event listeners + that._unbind(RESIZE_EV, window); + that._unbind(START_EV); + that._unbind(MOVE_EV, window); + that._unbind(END_EV, window); + that._unbind(CANCEL_EV, window); + + if (!that.options.hasTouch) { + that._unbind('DOMMouseScroll'); + that._unbind('mousewheel'); + } + + if (that.options.useTransition) that._unbind(TRNEND_EV); + + if (that.options.checkDOMChanges) clearInterval(that.checkDOMTime); + + if (that.options.onDestroy) that.options.onDestroy.call(that); + }, + + refresh: function () { + var that = this, + offset, + i, l, + els, + pos = 0, + page = 0; + + if (that.scale < that.options.zoomMin) that.scale = that.options.zoomMin; + that.wrapperW = that.wrapper.clientWidth || 1; + that.wrapperH = that.wrapper.clientHeight || 1; + + that.minScrollY = -that.options.topOffset || 0; + that.scrollerW = m.round(that.scroller.offsetWidth * that.scale); + that.scrollerH = m.round((that.scroller.offsetHeight + that.minScrollY) * that.scale); + that.maxScrollX = that.wrapperW - that.scrollerW; + that.maxScrollY = that.wrapperH - that.scrollerH + that.minScrollY; + that.dirX = 0; + that.dirY = 0; + + if (that.options.onRefresh) that.options.onRefresh.call(that); + + that.hScroll = that.options.hScroll && that.maxScrollX < 0; + that.vScroll = that.options.vScroll && (!that.options.bounceLock && !that.hScroll || that.scrollerH > that.wrapperH); + + that.hScrollbar = that.hScroll && that.options.hScrollbar; + that.vScrollbar = that.vScroll && that.options.vScrollbar && that.scrollerH > that.wrapperH; + + offset = that._offset(that.wrapper); + that.wrapperOffsetLeft = -offset.left; + that.wrapperOffsetTop = -offset.top; + + // Prepare snap + if (typeof that.options.snap == 'string') { + that.pagesX = []; + that.pagesY = []; + els = that.scroller.querySelectorAll(that.options.snap); + for (i=0, l=els.length; i= that.maxScrollX) { + that.pagesX[page] = pos; + pos = pos - that.wrapperW; + page++; + } + if (that.maxScrollX%that.wrapperW) that.pagesX[that.pagesX.length] = that.maxScrollX - that.pagesX[that.pagesX.length-1] + that.pagesX[that.pagesX.length-1]; + + pos = 0; + page = 0; + that.pagesY = []; + while (pos >= that.maxScrollY) { + that.pagesY[page] = pos; + pos = pos - that.wrapperH; + page++; + } + if (that.maxScrollY%that.wrapperH) that.pagesY[that.pagesY.length] = that.maxScrollY - that.pagesY[that.pagesY.length-1] + that.pagesY[that.pagesY.length-1]; + } + + // Prepare the scrollbars + that._scrollbar('h'); + that._scrollbar('v'); + + if (!that.zoomed) { + that.scroller.style[transitionDuration] = '0'; + that._resetPos(400); + } + }, + + scrollTo: function (x, y, time, relative) { + var that = this, + step = x, + i, l; + + that.stop(); + + if (!step.length) step = [{ x: x, y: y, time: time, relative: relative }]; + + for (i=0, l=step.length; i 0 ? 0 : pos.left < that.maxScrollX ? that.maxScrollX : pos.left; + pos.top = pos.top > that.minScrollY ? that.minScrollY : pos.top < that.maxScrollY ? that.maxScrollY : pos.top; + time = time === undefined ? m.max(m.abs(pos.left)*2, m.abs(pos.top)*2) : time; + + that.scrollTo(pos.left, pos.top, time); + }, + + scrollToPage: function (pageX, pageY, time) { + var that = this, x, y; + + time = time === undefined ? 400 : time; + + if (that.options.onScrollStart) that.options.onScrollStart.call(that); + + if (that.options.snap) { + pageX = pageX == 'next' ? that.currPageX+1 : pageX == 'prev' ? that.currPageX-1 : pageX; + pageY = pageY == 'next' ? that.currPageY+1 : pageY == 'prev' ? that.currPageY-1 : pageY; + + pageX = pageX < 0 ? 0 : pageX > that.pagesX.length-1 ? that.pagesX.length-1 : pageX; + pageY = pageY < 0 ? 0 : pageY > that.pagesY.length-1 ? that.pagesY.length-1 : pageY; + + that.currPageX = pageX; + that.currPageY = pageY; + x = that.pagesX[pageX]; + y = that.pagesY[pageY]; + } else { + x = -that.wrapperW * pageX; + y = -that.wrapperH * pageY; + if (x < that.maxScrollX) x = that.maxScrollX; + if (y < that.maxScrollY) y = that.maxScrollY; + } + + that.scrollTo(x, y, time); + }, + + disable: function () { + this.stop(); + this._resetPos(0); + this.enabled = false; + + // If disabled after touchstart we make sure that there are no left over events + this._unbind(MOVE_EV, window); + this._unbind(END_EV, window); + this._unbind(CANCEL_EV, window); + }, + + enable: function () { + this.enabled = true; + }, + + stop: function () { + if (this.options.useTransition) this._unbind(TRNEND_EV); + else cancelFrame(this.aniTime); + this.steps = []; + this.moved = false; + this.animating = false; + }, + + zoom: function (x, y, scale, time) { + var that = this, + relScale = scale / that.scale; + + if (!that.options.useTransform) return; + + that.zoomed = true; + time = time === undefined ? 200 : time; + x = x - that.wrapperOffsetLeft - that.x; + y = y - that.wrapperOffsetTop - that.y; + that.x = x - x * relScale + that.x; + that.y = y - y * relScale + that.y; + + that.scale = scale; + that.refresh(); + + that.x = that.x > 0 ? 0 : that.x < that.maxScrollX ? that.maxScrollX : that.x; + that.y = that.y > that.minScrollY ? that.minScrollY : that.y < that.maxScrollY ? that.maxScrollY : that.y; + + that.scroller.style[transitionDuration] = time + 'ms'; + that.scroller.style[transform] = 'translate(' + that.x + 'px,' + that.y + 'px) scale(' + scale + ')' + translateZ; + that.zoomed = false; + }, + + isReady: function () { + return !this.moved && !this.zoomed && !this.animating; + } +}; + +function prefixStyle (style) { + if ( vendor === '' ) return style; + + style = style.charAt(0).toUpperCase() + style.substr(1); + return vendor + style; +} + +dummyStyle = null; // for the sake of it + +if (typeof exports !== 'undefined') exports.iScroll = iScroll; +else window.iScroll = iScroll; + +})(window, document); diff --git a/WebContent/html/javascript/iconselect.js-1.0/nbproject/private/private.properties b/WebContent/html/javascript/iconselect.js-1.0/nbproject/private/private.properties index 3334426..d98a801 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/nbproject/private/private.properties +++ b/WebContent/html/javascript/iconselect.js-1.0/nbproject/private/private.properties @@ -1,6 +1,6 @@ -browser.id=Chrome.INTEGRATED -copy.src.on.open=false -debug.url=DEFAULT_URL -index.file=index.html -run.as=LOCAL -url=http://localhost/IconSelectJS/ +browser.id=Chrome.INTEGRATED +copy.src.on.open=false +debug.url=DEFAULT_URL +index.file=index.html +run.as=LOCAL +url=http://localhost/IconSelectJS/ diff --git a/WebContent/html/javascript/iconselect.js-1.0/nbproject/private/private.xml b/WebContent/html/javascript/iconselect.js-1.0/nbproject/private/private.xml index 6807a2b..284eeec 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/nbproject/private/private.xml +++ b/WebContent/html/javascript/iconselect.js-1.0/nbproject/private/private.xml @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/nbproject/project.properties b/WebContent/html/javascript/iconselect.js-1.0/nbproject/project.properties index d37ef95..8b7302c 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/nbproject/project.properties +++ b/WebContent/html/javascript/iconselect.js-1.0/nbproject/project.properties @@ -1,7 +1,7 @@ -include.path=${php.global.include.path} -php.version=PHP_54 -source.encoding=UTF-8 -src.dir=. -tags.asp=false -tags.short=false -web.root=. +include.path=${php.global.include.path} +php.version=PHP_54 +source.encoding=UTF-8 +src.dir=. +tags.asp=false +tags.short=false +web.root=. diff --git a/WebContent/html/javascript/iconselect.js-1.0/nbproject/project.xml b/WebContent/html/javascript/iconselect.js-1.0/nbproject/project.xml index a77857e..1676022 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/nbproject/project.xml +++ b/WebContent/html/javascript/iconselect.js-1.0/nbproject/project.xml @@ -1,9 +1,9 @@ - - - org.netbeans.modules.php.project - - - IconSelectJS - - - + + + org.netbeans.modules.php.project + + + IconSelectJS + + + diff --git a/WebContent/html/javascript/iconselect.js-1.0/profileIcon.js b/WebContent/html/javascript/iconselect.js-1.0/profileIcon.js index 1ad8373..6c1cb01 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/profileIcon.js +++ b/WebContent/html/javascript/iconselect.js-1.0/profileIcon.js @@ -1,34 +1,34 @@ -var iconSelect; - - window.onload = function(){ - - iconSelect = new IconSelect("my-icon-select", - {'selectedIconWidth':23, - 'selectedIconHeight':23, - 'selectedBoxPadding':1, - 'iconsWidth':48, - 'iconsHeight':48, - 'boxIconSpace':1, - 'vectoralIconNumber':2, - 'horizontalIconNumber':6}); - - var icons = []; - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/aquarium.png', 'iconValue':'1'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/bird.png', 'iconValue':'2'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/bird-1.png', 'iconValue':'3'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/diamond.png', 'iconValue':'4'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/doughnut.png', 'iconValue':'5'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/flask.png', 'iconValue':'6'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/fruit.png', 'iconValue':'7'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/gingerbread-man.png', 'iconValue':'8'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/like.png', 'iconValue':'9'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/moon.png', 'iconValue':'10'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/octopus.png', 'iconValue':'11'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/paint-brush.png', 'iconValue':'12'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/snorkel.png', 'iconValue':'13'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/squirrel.png', 'iconValue':'14'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/sweater.png', 'iconValue':'15'}); - - iconSelect.refresh(icons); - +var iconSelect; + + window.onload = function(){ + + iconSelect = new IconSelect("my-icon-select", + {'selectedIconWidth':23, + 'selectedIconHeight':23, + 'selectedBoxPadding':1, + 'iconsWidth':48, + 'iconsHeight':48, + 'boxIconSpace':1, + 'vectoralIconNumber':2, + 'horizontalIconNumber':6}); + + var icons = []; + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/aquarium.png', 'iconValue':'1'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/bird.png', 'iconValue':'2'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/bird-1.png', 'iconValue':'3'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/diamond.png', 'iconValue':'4'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/doughnut.png', 'iconValue':'5'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/flask.png', 'iconValue':'6'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/fruit.png', 'iconValue':'7'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/gingerbread-man.png', 'iconValue':'8'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/like.png', 'iconValue':'9'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/moon.png', 'iconValue':'10'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/octopus.png', 'iconValue':'11'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/paint-brush.png', 'iconValue':'12'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/snorkel.png', 'iconValue':'13'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/squirrel.png', 'iconValue':'14'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/sweater.png', 'iconValue':'15'}); + + iconSelect.refresh(icons); + }; \ No newline at end of file diff --git a/WebContent/html/javascript/iconselect.js-1.0/readme.txt b/WebContent/html/javascript/iconselect.js-1.0/readme.txt index 255f2c7..7f69df2 100644 --- a/WebContent/html/javascript/iconselect.js-1.0/readme.txt +++ b/WebContent/html/javascript/iconselect.js-1.0/readme.txt @@ -1,18 +1,18 @@ - Code: IconSelect JS - - Year: 8 Dec 2013 - Autor: Buğra ÖZDEN - Mail: bugra.ozden@gmail.com - Site: bugraozden.com - - - You are free: - - to Share — to copy, distribute and transmit the work - to Remix — to adapt the work - to make commercial use of the work - - - - + Code: IconSelect JS + + Year: 8 Dec 2013 + Autor: Buğra ÖZDEN + Mail: bugra.ozden@gmail.com + Site: bugraozden.com + + + You are free: + + to Share — to copy, distribute and transmit the work + to Remix — to adapt the work + to make commercial use of the work + + + + Have Fun. \ No newline at end of file diff --git a/WebContent/html/javascript/listing.jsp b/WebContent/html/javascript/listing.jsp index 456db40..b9b2c73 100644 --- a/WebContent/html/javascript/listing.jsp +++ b/WebContent/html/javascript/listing.jsp @@ -1,4 +1,4 @@ -<%@ page import = "database.MySQLAccess" %> +<%@ page import = "database.MySQLAccess,entities.ListedDevice" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> @@ -9,95 +9,80 @@ <% -/*MySQLAccess myaccess = new MySQLAccess(); -myaccess.connectDB(); -String name = myaccess.getResult()[0][0]; -String description = myaccess.getResult()[0][1]; -String hardware = myaccess.getResult()[0][2];*/ -//out.println(name); +MySQLAccess myaccess = new MySQLAccess(); +ListedDevice[] mydevices = myaccess.getAllDevices(); + +//string representation of array. +String deviceString = ListedDevice.arrayToString(mydevices); //out.println(description); //out.println(hardware); + %> \ No newline at end of file diff --git a/WebContent/html/javascript/navbar.js b/WebContent/html/javascript/navbar.js index e9c421e..3e706ea 100644 --- a/WebContent/html/javascript/navbar.js +++ b/WebContent/html/javascript/navbar.js @@ -1 +1 @@ -document.getElementById('navbaruniversal').innerHTML = '
' +document.getElementById('navbaruniversal').innerHTML = '
' diff --git a/WebContent/html/javascript/profileIcon.js b/WebContent/html/javascript/profileIcon.js index bb819ee..1b127b2 100644 --- a/WebContent/html/javascript/profileIcon.js +++ b/WebContent/html/javascript/profileIcon.js @@ -1,37 +1,37 @@ -var iconSelect; - - window.onload = function(){ - - iconSelect = new IconSelect("my-icon-select", - {'selectedIconWidth':23, - 'selectedIconHeight':23, - 'selectedBoxPadding':3, - 'iconsWidth':48, - 'iconsHeight':48, - 'boxIconSpace':5, - 'vectoralIconNumber':2, - 'horizontalIconNumber':8}); - - var icons = []; - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/1.png', 'iconValue':'1'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/2.png', 'iconValue':'2'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/3.png', 'iconValue':'3'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/4.png', 'iconValue':'4'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/5.png', 'iconValue':'5'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/6.png', 'iconValue':'6'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/7.png', 'iconValue':'7'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/8.png', 'iconValue':'8'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/9.png', 'iconValue':'9'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/10.png', 'iconValue':'10'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/11.png', 'iconValue':'11'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/12.png', 'iconValue':'12'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/13.png', 'iconValue':'13'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/14.png', 'iconValue':'14'}); - icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/15.png', 'iconValue':'15'}); - - iconSelect.refresh(icons); - - //around here is where you'll have to define the current image, then this will update as the user selects new ones! - $('#profimg').attr("src","../imgs/my-icons-collection-128px/png/11.png"); - +var iconSelect; + + window.onload = function(){ + + iconSelect = new IconSelect("my-icon-select", + {'selectedIconWidth':23, + 'selectedIconHeight':23, + 'selectedBoxPadding':3, + 'iconsWidth':48, + 'iconsHeight':48, + 'boxIconSpace':5, + 'vectoralIconNumber':2, + 'horizontalIconNumber':8}); + + var icons = []; + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/1.png', 'iconValue':'1'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/2.png', 'iconValue':'2'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/3.png', 'iconValue':'3'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/4.png', 'iconValue':'4'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/5.png', 'iconValue':'5'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/6.png', 'iconValue':'6'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/7.png', 'iconValue':'7'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/8.png', 'iconValue':'8'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/9.png', 'iconValue':'9'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/10.png', 'iconValue':'10'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/11.png', 'iconValue':'11'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/12.png', 'iconValue':'12'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/13.png', 'iconValue':'13'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/14.png', 'iconValue':'14'}); + icons.push({'iconFilePath':'../imgs/my-icons-collection-32px/png/15.png', 'iconValue':'15'}); + + iconSelect.refresh(icons); + + //around here is where you'll have to define the current image, then this will update as the user selects new ones! + $('#profimg').attr("src","../imgs/my-icons-collection-128px/png/11.png"); + }; \ No newline at end of file diff --git a/WebContent/html/javascript/profileSettings.js b/WebContent/html/javascript/profileSettings.js index 3615b1d..907c3b1 100644 --- a/WebContent/html/javascript/profileSettings.js +++ b/WebContent/html/javascript/profileSettings.js @@ -1,86 +1,86 @@ -//event listener on the apply changes button -document.getElementById('apply').addEventListener('click',applyChanges); -document.getElementById('inputName').addEventListener('keyup',checkEmpty); -document.getElementById('inputSSO').addEventListener('keyup',checkEmpty); -document.getElementById('closeBttn').addEventListener('click',function(){document.getElementById('missingcontent').style.display = "none";}); - -var typeTimer; -var doneTypingInterval = 2000 //ms - -$('#inputSSO').keyup(function(){clearTimeout(typeTimer); typeTimer = setTimeout(querySSO,doneTypingInterval);}); - -var flag = 0; -var name; -var SSO; -var telephone; -var email; - -//populates the fields -populate(); - -//sends applied changes to DB -function applyChanges(){ - if(flag == 0){ - name = $('#inputName').val(); - SSO = $('#inputSSO').val(); - telephone = $('#inputTelephone').val(); - email = $('#inputEmail').val(); - - //send these values to DB for updates to be made - //EX - //if(name != "") - //send to database - } - - else - $('#missingcontent').css('display','block'); -} - -//populates form fields if info exists in db already -function populate(){ - //get values from database - - //$('#inputName').val(name); - //$('#inputSSO').val(SSO); - //$('#inputTelephone').val(telephone); - //$('#inputEmail').val(email); -} - -function checkEmpty(){ - var id = this.getAttribute('id'); - if($('#' + id).val() == ""){ - $('#' + id).parent().attr('class','form-group has-error'); - $('#' + id).siblings('span').text(warningtext(id)) - } - else{ - $('#' + id).parent().attr('class','form-group'); - $('#' + id).siblings('span').text('') - } - -} - -function warningtext(id){ - if(id == "inputName") - return "This is a required field."; - else if (id == "inputSSO") - return "This is a required field."; -} - -function querySSO(){ - //query to see if SSO is in database already - - //if so... && val() != "" - //$('#' + id).parent().attr('class','form-group has-error'); - //$('#inputSSO').siblings('span').text('SSO is currently in use.'); - //flag = 1; - - //if not... && val() != "" - //$('#' + id).parent().attr('class','form-group'); - //$('#' + id).siblings('span').text(''); -} - -window.onclick = function(event) { - var modal = document.getElementById('missingcontent'); - if(event.target == modal) - modal.style.display = "none"; +//event listener on the apply changes button +document.getElementById('apply').addEventListener('click',applyChanges); +document.getElementById('inputName').addEventListener('keyup',checkEmpty); +document.getElementById('inputSSO').addEventListener('keyup',checkEmpty); +document.getElementById('closeBttn').addEventListener('click',function(){document.getElementById('missingcontent').style.display = "none";}); + +var typeTimer; +var doneTypingInterval = 2000 //ms + +$('#inputSSO').keyup(function(){clearTimeout(typeTimer); typeTimer = setTimeout(querySSO,doneTypingInterval);}); + +var flag = 0; +var name; +var SSO; +var telephone; +var email; + +//populates the fields +populate(); + +//sends applied changes to DB +function applyChanges(){ + if(flag == 0){ + name = $('#inputName').val(); + SSO = $('#inputSSO').val(); + telephone = $('#inputTelephone').val(); + email = $('#inputEmail').val(); + + //send these values to DB for updates to be made + //EX + //if(name != "") + //send to database + } + + else + $('#missingcontent').css('display','block'); +} + +//populates form fields if info exists in db already +function populate(){ + //get values from database + + //$('#inputName').val(name); + //$('#inputSSO').val(SSO); + //$('#inputTelephone').val(telephone); + //$('#inputEmail').val(email); +} + +function checkEmpty(){ + var id = this.getAttribute('id'); + if($('#' + id).val() == ""){ + $('#' + id).parent().attr('class','form-group has-error'); + $('#' + id).siblings('span').text(warningtext(id)) + } + else{ + $('#' + id).parent().attr('class','form-group'); + $('#' + id).siblings('span').text('') + } + +} + +function warningtext(id){ + if(id == "inputName") + return "This is a required field."; + else if (id == "inputSSO") + return "This is a required field."; +} + +function querySSO(){ + //query to see if SSO is in database already + + //if so... && val() != "" + //$('#' + id).parent().attr('class','form-group has-error'); + //$('#inputSSO').siblings('span').text('SSO is currently in use.'); + //flag = 1; + + //if not... && val() != "" + //$('#' + id).parent().attr('class','form-group'); + //$('#' + id).siblings('span').text(''); +} + +window.onclick = function(event) { + var modal = document.getElementById('missingcontent'); + if(event.target == modal) + modal.style.display = "none"; } \ No newline at end of file diff --git a/WebContent/html/javascript/return.js b/WebContent/html/javascript/return.js deleted file mode 100644 index 6298caa..0000000 --- a/WebContent/html/javascript/return.js +++ /dev/null @@ -1,211 +0,0 @@ - -var dev1 = { - id: 1, - name:"George", - hardware:"iphone", - checkout: new Date("11/11/2016"), -}; - -var dev2 = { - id: 2, - name:"Greyson", - hardware:"iphone", - checkout: new Date("8/10/2016"), -}; - -var dev3 = { - id: 3, - name:"Linkin Park", - hardware:"ipad", - checkout: new Date("8/20/2016"), -}; - -var dev4 = { - id: 4, - name:"Abercrombie", - hardware:"ipad", - checkout: new Date("11/3/2016"), -}; - -var dev5 = { - id: 5, - name:"Hulk", - hardware:"computerStick", - checkout: new Date("4/28/2016"), -}; - -var dev6 = { - id: 6, - name:"Captain America", - hardware:"computerStick", - checkout: new Date("10/22/2016"), -}; - -var devices = [dev1, dev2, dev3, dev4, dev5, dev6]; -//This array corresponds to the hardcoded inventory in request.js. The description has been replaced with a -//checkout date, because I imagine that is more the kind of info to pull from the database for this page. -//IDs, names and hardware are the same. - -var options = document.getElementsByClassName('option'); -for (var i = options.length - 1; i >= 0; i--) { - options[i].addEventListener('click',filterDeviceList); -} - - -populateDeviceList(null); - -function filterDeviceList() -{ - var id = this.getAttribute('id'); - month=30*24*60*60*1000; - var upperbound; - var lowerbound; - var filter = new Array(); - switch(id) - { - case "all": - populateDeviceList(null); - break; - case "1month": - upperbound=new Date().getTime(); - lowerbound=upperbound-month; - filter=[lowerbound, upperbound]; - populateDeviceList(filter); - break; - case "1-3months": - upperbound=new Date().getTime()-month; - lowerbound=upperbound-2*month; - filter=[lowerbound, upperbound]; - populateDeviceList(filter); - break; - case "3-5months": - upperbound=new Date().getTime()-3*month; - lowerbound=upperbound-2*month; - filter=[lowerbound, upperbound]; - populateDeviceList(filter); - break; - case "5+months": - upperbound=new Date().getTime()-5*month; - lowerbound=0; - filter=[lowerbound, upperbound]; - populateDeviceList(filter); - break; - } -} - -function populateDeviceList(filter) -//generates html and writes to 'devContainer' div in returnPage.html -{ - var devicesToList = getCheckedOutDevices(null,filter); - var htmlString=""; - var i; - for (i = 0; i < devicesToList.length; i++) { - var id = devicesToList[i].id; - var name = devicesToList[i].name; - var hardware = devicesToList[i].hardware; - var checkout = devicesToList[i].checkout; - htmlString+="
"; - htmlString+=name; - htmlString+="

Checked out: " - htmlString+=checkout.toISOString().substring(0,10); - htmlString+="

You've had this device for "; - var milliseconds=new Date().getTime()-checkout.getTime(); - var seconds=Math.floor(milliseconds/1000); - var minutes=Math.floor(seconds/60); - var hours=Math.floor(minutes/60); - var days=Math.floor(hours/24); - var weeks=Math.floor(days/7); - var months=Math.floor(weeks/4); - if(months>=2) htmlString+=months+" months"; - else - { - htmlString+= weeks+ " week"; - if(weeks!=1) htmlString+="s"; - } - htmlString+="!"; - htmlString+="



"; - } - if(i==0) htmlString+="Couldn't find any devices to return. Why not go order some?"; - document.getElementById("devContainer").innerHTML = htmlString; - - var returnbuttons = document.getElementsByClassName('returnbutton'); - for (var i = 0; i < returnbuttons.length; i++) { - returnbuttons[i].addEventListener('click',returnDevice); - } -} - -function returnDevice() -{ - var id = this.getAttribute('id'); - id = parseInt(id.replace(/[^0-9\.]/g,''), 10); - if(isUnavailable(id)) - { - var unavailable = getUnavailableIDs(); - unavailable.splice(unavailable.indexOf(id),1); - localStorage.setItem('unavailable',JSON.stringify(unavailable)); - $('#return').fadeIn(1000); - $('#return').fadeIn(1000); - $('#return').fadeOut(1000); - } - else - alert("That's already marked available. Something may have gone wrong."); - populateDeviceList(); -} - -function getCheckedOutDevices(user, filter) -//Eventually this will return information about all devices checked out by *user* -//Right now there is only one user, and the function just returns IDs of all checked out devicess. -//'Filter' is passed as a two-element array representing a range of milliseconds. -//If the checkout date for a device falls within that range, then it will be included in the results. -//The filter may be null. If so, all checked out devices will be returned. -{ - var unavailable = getUnavailableIDs(); - var checkedDevices = new Array(); - for (var i = 0; i < unavailable.length; i++) { - for (var j = 0; j < devices.length; j++) { - if(unavailable[i] == devices[j].id) - { - if(filter!=null) - { - var checkedOutMillis = devices[j].checkout.getTime(); - if(filter[0]checkedOutMillis) - checkedDevices.push(devices[j]); - } - else - checkedDevices.push(devices[j]); - break; - } - } - } - return checkedDevices; -} - -function isUnavailable(id){ - var unavailable = getUnavailableIDs(); - if(unavailable.length == 0) - return 0; - else{ - for(var i = 0; i < unavailable.length; i++){ - if(unavailable[i] == (id)) - return 1; - } - } - return 0; -} -function getUnavailableIDs() -//Identical to the function in request.js: just reads the 'unavailable' array in local storage. -//Will need to be changed (or may be obsolete) when we get a database -{ - var unavailable = new Array; - var unavailable_str = localStorage.getItem('unavailable'); - if(unavailable_str !== "" && unavailable_str !== null){ - unavailable = JSON.parse(unavailable_str); - } - return unavailable; -} \ No newline at end of file diff --git a/WebContent/html/javascript/shoppingCart.js b/WebContent/html/javascript/shoppingCart.js index ff47c6a..8a94de3 100644 --- a/WebContent/html/javascript/shoppingCart.js +++ b/WebContent/html/javascript/shoppingCart.js @@ -1,242 +1,242 @@ -//here are all the hardcoded devices - -var dev1 = { - id: 1, - name:"George", - description:"George is probably the coolest iPhone to exist. Ever. Point blank, period.", - hardware:"iPhone", - software:"apple", -}; - -var dev2 = { - id: 2, - name:"Greyson", - description:"Greyson is pretty cool.. I guess.", - hardware:"iPhone", - software:"apple", -}; - -var dev3 = { - id: 3, - name:"Linkin Park", - description:'"The hardest part of ending is starting again."', - hardware:"iPad", - software:"apple", -}; - -var dev4 = { - id: 4, - name:"Abercrombie", - description:"To all the people that hated me in high school, I have the prettiest clothes you all wear now!!", - hardware:"iPad", - software:"apple", -}; - -var dev5 = { - id: 5, - name:"Hulk", - description:"Go ahead and HULK SMASH! this awesome computer stick into your USB.", - hardware:"Computer Stick", - software:"intel", -}; - -var dev6 = { - id: 6, - name:"Captain America", - description:""Make America Great Again." Wait, thats someone else..", - hardware:"Computer Stick", - software:"intel", -}; - -var devices = [dev1, dev2, dev3, dev4, dev5, dev6]; //put them all into an array -var checked = new Array; //this is the array that will indicate whether a shopping cart item is checked off or not - -//adding event listeners to all the options, such as ordering and deleting -document.getElementById('os').addEventListener('click',showPopup); -document.getElementById('ds').addEventListener('click',deleteSelected); -document.getElementById('oa').addEventListener('click',showPopup); -document.getElementById('da').addEventListener('click',deleteAll); - -// Shipping form popup--------------------- -var orderForm = document.getElementById('orderInfoModal'); -var orderFormCloseButton = document.getElementById('closeOrderForm'); -orderFormCloseButton.addEventListener('click',hidePopup); -show(); //on load, we want to show everything - -function getCartItems(){ - var cart = new Array; //initiate array for them - var cart_str = localStorage.getItem('cart'); //get them from local storage - if (cart_str !== null) { //if there is at least one object already we need to convert it from JSON to string - cart = JSON.parse(cart_str); - } - return cart; //return value is an array -} - -/** -This function displays a list of devices that a user has currently in their shopping cart. -**/ -function show(){ - var cart = getCartItems(); //get all the cart items you want to show - var html = ''; //html string initially empty - var part1 = "nhpup.popup('"; - var part2 = "');" - if(cart.length !== 0){ //only continue if there are cart items - html += '

Tickets have been generated below based on your desired selections.


' - for(var i = 0; i < cart.length; i++){ //iterate cart - var id = cart[i]; //this gets the id value from the cart - for(var j = 0; j < devices.length; j++){ //iterate device list - if(devices[j].id === id){ //match the id's "nhpup.popup(' ');" - html += ''; //create listing of all the devices - break; //break out of loop when we match - } - } - } - } - else{ //no point in doing all that computing if the list is empty - html += 'Shopping cart is empty.'; //so give a nice error message. - } - - document.getElementById('shoppingContainer').innerHTML = html; //adds what we just generated to the webpage - - var checkboxes = document.getElementsByClassName('deviceCheckbox'); //get all the checkboxes we just placed! - for(var i = 0; i < checkboxes.length; i++){ //iterate them - checkboxes[i].addEventListener('click',changeStatus); //when we click on a checkbox, it should add/remove the id from the selected array - } - - var tickets = document.getElementsByClassName('ticket'); - for(var i = 0; i < tickets.length; i++){ - tickets[i].addEventListener('click',clickTicket); - } -} - -/** -This allows a ticket click to do the same thing as clicking on the checkbox. -**/ -function clickTicket(){ - var checkboxes = document.getElementsByClassName('deviceCheckbox'); - var id = this.getAttribute('id'); - id = parseInt(id.replace(/[^0-9\.]/g,''),10); - if(document.getElementById(id).checked == true){ - document.getElementById(id).checked = false; - for(var i = 0; i < checked.length; i++){ //iterate checked array - if(id == checked[i]) //find the right checkbox - checked.splice(i,1); //remove from the array - } - } - else{ - document.getElementById(id).checked = true; - checked.push(id); - } -} - -/** -When a checkbox is clicked, either a device needs to be checked or unchecked in the shopping cart. This function handles JUST that. -**/ -function changeStatus(){ - var id = this.getAttribute('id'); //get the checkbox's id - if(this.checked == true){ //we just checked it off - checked.push(id); //add item to the selected list - } - else{ //we just unchecked it - for(var i = 0; i < checked.length; i++){ //iterate checked array - if(id == checked[i]) //find the right checkbox - checked.splice(i,1); //remove from the array - } - } -} - -/** -This function takes all the devices we selected and simulates an order on them. -**/ -function showPopup(){ - orderForm.style.display = "block"; -} -function hidePopup(){ - orderForm.style.display = "none"; -} - -function orderSelected(){ - var response = confirm("Are you sure you'd like to order the selected items?"); - if(response == true){ //if they confirm - for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices - var id = checked[i]; //get the id of each device - var requested = getRequestedItems(); //get the unavailable items - var cart = getCartItems(); //get the cart - requested.push(id); //add to unavailable list - for(var j = 0; j < cart.length; j++){ //iterate cart - if(cart[j] == id) //match id's - cart.splice(j,1); //remove from the cart - } - localStorage.setItem('requested', JSON.stringify(requested)); //update local storage - localStorage.setItem('cart', JSON.stringify(cart)); //update local storage - } - checked = new Array; //reset the checked off array - show(); //reload the container - } -} - -/** -This function takes all the devices we selected and removes them from the shopping cart. -**/ -function deleteSelected(){ - var response = confirm("Are you sure you'd like to remove the selected items from the cart?"); - if(response == true){ //if they confirm - for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices - var id = checked[i]; //get the id of each device - var cart = getCartItems(); //get the cart - for(var j = 0; j < cart.length; j++){ //iterate cart - if(cart[j] == id){ //match ids - cart.splice(j,1); //remove from the cart - } - } - localStorage.setItem('cart', JSON.stringify(cart)); //update local storage - } - checked = new Array; //reset the checked array - show(); //reload the container - } -} - -/** -This function takes all devices in the shopping cart and orders them. -**/ -function orderAll(){ - var response = confirm("Are you sure you'd like to order the selected items?"); - if(response == true){ //if they confirm - var cart = getCartItems(); //get the cart - for(var i = 0; i < cart.length; i++){ //iterate the cart - var id = cart[i]; //get the id of each device - var requested = getRequestedItems(); //get the unavailable items - requested.push(id); //add to unavailable list - localStorage.setItem('requested', JSON.stringify(requested)); //update local storage - } - checked = new Array; //reset the checked off array - cart = new Array; //cart should now be empty, so reset also - localStorage.setItem('cart',JSON.stringify(cart)); //update local storage - show(); //reload container - } -} - -/** -This function takes all devices in the shopping cart and deletes them. -**/ -function deleteAll(){ - var response = confirm("Are you sure you'd like to order the selected items?"); - if(response == true){ //if they confirm - cart = new Array; //empty cart - localStorage.setItem('cart',JSON.stringify(cart)); //update local storage - checked = new Array; //reset the checked off array - show(); //reload container - } -} - -/** -This function gets requested items from local storage. -**/ -function getRequestedItems(){ - var requested = new Array; //make new array - var requested_str = localStorage.getItem('requested'); //get the string from local storage - if(requested_str !== '' && requested_str !== null){ //as long as its not null - requested = JSON.parse(requested_str); //make into array - } - return requested; //return value is an array +//here are all the hardcoded devices + +var dev1 = { + id: 1, + name:"George", + description:"George is probably the coolest iPhone to exist. Ever. Point blank, period.", + hardware:"iPhone", + software:"apple", +}; + +var dev2 = { + id: 2, + name:"Greyson", + description:"Greyson is pretty cool.. I guess.", + hardware:"iPhone", + software:"apple", +}; + +var dev3 = { + id: 3, + name:"Linkin Park", + description:'"The hardest part of ending is starting again."', + hardware:"iPad", + software:"apple", +}; + +var dev4 = { + id: 4, + name:"Abercrombie", + description:"To all the people that hated me in high school, I have the prettiest clothes you all wear now!!", + hardware:"iPad", + software:"apple", +}; + +var dev5 = { + id: 5, + name:"Hulk", + description:"Go ahead and HULK SMASH! this awesome computer stick into your USB.", + hardware:"Computer Stick", + software:"intel", +}; + +var dev6 = { + id: 6, + name:"Captain America", + description:""Make America Great Again." Wait, thats someone else..", + hardware:"Computer Stick", + software:"intel", +}; + +var devices = [dev1, dev2, dev3, dev4, dev5, dev6]; //put them all into an array +var checked = new Array; //this is the array that will indicate whether a shopping cart item is checked off or not + +//adding event listeners to all the options, such as ordering and deleting +document.getElementById('os').addEventListener('click',showPopup); +document.getElementById('ds').addEventListener('click',deleteSelected); +document.getElementById('oa').addEventListener('click',showPopup); +document.getElementById('da').addEventListener('click',deleteAll); + +// Shipping form popup--------------------- +var orderForm = document.getElementById('orderInfoModal'); +var orderFormCloseButton = document.getElementById('closeOrderForm'); +orderFormCloseButton.addEventListener('click',hidePopup); +show(); //on load, we want to show everything + +function getCartItems(){ + var cart = new Array; //initiate array for them + var cart_str = localStorage.getItem('cart'); //get them from local storage + if (cart_str !== null) { //if there is at least one object already we need to convert it from JSON to string + cart = JSON.parse(cart_str); + } + return cart; //return value is an array +} + +/** +This function displays a list of devices that a user has currently in their shopping cart. +**/ +function show(){ + var cart = getCartItems(); //get all the cart items you want to show + var html = ''; //html string initially empty + var part1 = "nhpup.popup('"; + var part2 = "');" + if(cart.length !== 0){ //only continue if there are cart items + html += '

Tickets have been generated below based on your desired selections.


' + for(var i = 0; i < cart.length; i++){ //iterate cart + var id = cart[i]; //this gets the id value from the cart + for(var j = 0; j < devices.length; j++){ //iterate device list + if(devices[j].id === id){ //match the id's "nhpup.popup(' ');" + html += ''; //create listing of all the devices + break; //break out of loop when we match + } + } + } + } + else{ //no point in doing all that computing if the list is empty + html += 'Shopping cart is empty.'; //so give a nice error message. + } + + document.getElementById('shoppingContainer').innerHTML = html; //adds what we just generated to the webpage + + var checkboxes = document.getElementsByClassName('deviceCheckbox'); //get all the checkboxes we just placed! + for(var i = 0; i < checkboxes.length; i++){ //iterate them + checkboxes[i].addEventListener('click',changeStatus); //when we click on a checkbox, it should add/remove the id from the selected array + } + + var tickets = document.getElementsByClassName('ticket'); + for(var i = 0; i < tickets.length; i++){ + tickets[i].addEventListener('click',clickTicket); + } +} + +/** +This allows a ticket click to do the same thing as clicking on the checkbox. +**/ +function clickTicket(){ + var checkboxes = document.getElementsByClassName('deviceCheckbox'); + var id = this.getAttribute('id'); + id = parseInt(id.replace(/[^0-9\.]/g,''),10); + if(document.getElementById(id).checked == true){ + document.getElementById(id).checked = false; + for(var i = 0; i < checked.length; i++){ //iterate checked array + if(id == checked[i]) //find the right checkbox + checked.splice(i,1); //remove from the array + } + } + else{ + document.getElementById(id).checked = true; + checked.push(id); + } +} + +/** +When a checkbox is clicked, either a device needs to be checked or unchecked in the shopping cart. This function handles JUST that. +**/ +function changeStatus(){ + var id = this.getAttribute('id'); //get the checkbox's id + if(this.checked == true){ //we just checked it off + checked.push(id); //add item to the selected list + } + else{ //we just unchecked it + for(var i = 0; i < checked.length; i++){ //iterate checked array + if(id == checked[i]) //find the right checkbox + checked.splice(i,1); //remove from the array + } + } +} + +/** +This function takes all the devices we selected and simulates an order on them. +**/ +function showPopup(){ + orderForm.style.display = "block"; +} +function hidePopup(){ + orderForm.style.display = "none"; +} + +function orderSelected(){ + var response = confirm("Are you sure you'd like to order the selected items?"); + if(response == true){ //if they confirm + for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices + var id = checked[i]; //get the id of each device + var requested = getRequestedItems(); //get the unavailable items + var cart = getCartItems(); //get the cart + requested.push(id); //add to unavailable list + for(var j = 0; j < cart.length; j++){ //iterate cart + if(cart[j] == id) //match id's + cart.splice(j,1); //remove from the cart + } + localStorage.setItem('requested', JSON.stringify(requested)); //update local storage + localStorage.setItem('cart', JSON.stringify(cart)); //update local storage + } + checked = new Array; //reset the checked off array + show(); //reload the container + } +} + +/** +This function takes all the devices we selected and removes them from the shopping cart. +**/ +function deleteSelected(){ + var response = confirm("Are you sure you'd like to remove the selected items from the cart?"); + if(response == true){ //if they confirm + for(var i = 0; i < checked.length; i++){ //iterate all the checked off devices + var id = checked[i]; //get the id of each device + var cart = getCartItems(); //get the cart + for(var j = 0; j < cart.length; j++){ //iterate cart + if(cart[j] == id){ //match ids + cart.splice(j,1); //remove from the cart + } + } + localStorage.setItem('cart', JSON.stringify(cart)); //update local storage + } + checked = new Array; //reset the checked array + show(); //reload the container + } +} + +/** +This function takes all devices in the shopping cart and orders them. +**/ +function orderAll(){ + var response = confirm("Are you sure you'd like to order the selected items?"); + if(response == true){ //if they confirm + var cart = getCartItems(); //get the cart + for(var i = 0; i < cart.length; i++){ //iterate the cart + var id = cart[i]; //get the id of each device + var requested = getRequestedItems(); //get the unavailable items + requested.push(id); //add to unavailable list + localStorage.setItem('requested', JSON.stringify(requested)); //update local storage + } + checked = new Array; //reset the checked off array + cart = new Array; //cart should now be empty, so reset also + localStorage.setItem('cart',JSON.stringify(cart)); //update local storage + show(); //reload container + } +} + +/** +This function takes all devices in the shopping cart and deletes them. +**/ +function deleteAll(){ + var response = confirm("Are you sure you'd like to order the selected items?"); + if(response == true){ //if they confirm + cart = new Array; //empty cart + localStorage.setItem('cart',JSON.stringify(cart)); //update local storage + checked = new Array; //reset the checked off array + show(); //reload container + } +} + +/** +This function gets requested items from local storage. +**/ +function getRequestedItems(){ + var requested = new Array; //make new array + var requested_str = localStorage.getItem('requested'); //get the string from local storage + if(requested_str !== '' && requested_str !== null){ //as long as its not null + requested = JSON.parse(requested_str); //make into array + } + return requested; //return value is an array } \ No newline at end of file diff --git a/WebContent/html/webpages/admin.html b/WebContent/html/webpages/admin.html index cc969b6..312348b 100644 --- a/WebContent/html/webpages/admin.html +++ b/WebContent/html/webpages/admin.html @@ -1,90 +1,90 @@ - - - - - - - - - -Synchrony Financial - - - - - - - - - - - - -
- -
-
-

Welcome to the admin page

-
-
- - - - - - + + + + + + + + + +Synchrony Financial + + + + + + + + + + + + +
+ +
+
+

Welcome to the admin page

+
+
+ + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/index.html b/WebContent/html/webpages/index.html index 3993eb2..5f5a100 100644 --- a/WebContent/html/webpages/index.html +++ b/WebContent/html/webpages/index.html @@ -1,82 +1,82 @@ - - - - - - - - - - Synchrony Financial - - - - - - - - - - - - - - -
- - -
- - - - - + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + + +
+ + +
+ + + + + diff --git a/WebContent/html/webpages/listingPage.jsp b/WebContent/html/webpages/listingPage.jsp index d2f6067..a5b1633 100644 --- a/WebContent/html/webpages/listingPage.jsp +++ b/WebContent/html/webpages/listingPage.jsp @@ -1,79 +1,79 @@ - - - - - - - - - - - Synchrony Financial - - - - - - - - - - - -
- -
- -
- -
-

Device Dictionary

-
-
- - <%@ include file="../javascript/listing.jsp" %> - - + + + + + + + + + + + Synchrony Financial + + + + + + + + + + + +
+ +
+ +
+ +
+

Device Dictionary

+
+
+ + <%@ include file="../javascript/listing.jsp" %> + + \ No newline at end of file diff --git a/WebContent/html/webpages/map.html b/WebContent/html/webpages/map.html index 5256954..09d9fec 100644 --- a/WebContent/html/webpages/map.html +++ b/WebContent/html/webpages/map.html @@ -1,89 +1,89 @@ - - - - - - - - - - Synchrony Financial - - - - - - - - - - - - - - - -

Our Wonderful Synchrony Financial Map!

- -
- - - - - - + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + + + +

Our Wonderful Synchrony Financial Map!

+ +
+ + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/profileSettings.html b/WebContent/html/webpages/profileSettings.html index 5ff5ede..b907797 100644 --- a/WebContent/html/webpages/profileSettings.html +++ b/WebContent/html/webpages/profileSettings.html @@ -1,119 +1,119 @@ - - - - - - - - - - Synchrony Financial - - - - - - - - - - - - - - - - -
- -
- - - -
-
-
- -
-
-

Change profile image:

-
-
-
-

Profile Settings

-
- - - -
-
- - - -
-
- - -
-
- - -
- -
-
- - - - - - + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + + + + +
+ +
+ + + +
+
+
+ +
+
+

Change profile image:

+
+
+
+

Profile Settings

+
+ + + +
+
+ + + +
+
+ + +
+
+ + +
+ +
+
+ + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/requestPage.html b/WebContent/html/webpages/requestPage.html index 7ac04a7..e4d7bb8 100644 --- a/WebContent/html/webpages/requestPage.html +++ b/WebContent/html/webpages/requestPage.html @@ -1,104 +1,104 @@ - - - - - - - - - - Synchrony Financial - - - - - - - - - - - -
-
    -

    Hardware Type

    -
    • -
    • -
    • -
    • -
    • -
    • -
-
-
    -

    Manufacture

    -
    • -
    • -
    • -
    • -
    • -
    • -
-
- -
-

Available Devices

-

Choose an option to the left to begin requesting!

-
- -
-

Added to Cart

-
- -
-

Already in Cart

-
- - - - + + + + + + + + + + Synchrony Financial + + + + + + + + + + + +
+
    +

    Hardware Type

    +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
    +

    Manufacture

    +
    • +
    • +
    • +
    • +
    • +
    • +
+
+ +
+

Available Devices

+

Choose an option to the left to begin requesting!

+
+ +
+

Added to Cart

+
+ +
+

Already in Cart

+
+ + + + \ No newline at end of file diff --git a/WebContent/html/webpages/returnPage.html b/WebContent/html/webpages/returnPage.html deleted file mode 100644 index fdcda6c..0000000 --- a/WebContent/html/webpages/returnPage.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - Synchrony Financial - - - - - - - - - - -
- -
-
-

Devices to Be Returned

-
-
-
-
-

Returned

-
- - - - \ No newline at end of file diff --git a/WebContent/html/webpages/returnPage.jsp b/WebContent/html/webpages/returnPage.jsp new file mode 100644 index 0000000..b5b5fb9 --- /dev/null +++ b/WebContent/html/webpages/returnPage.jsp @@ -0,0 +1,258 @@ +<%@ page import = "database.MySQLAccess,entities.RentedDevice" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + + +
+ +
+
+

Devices to Be Returned

+ +
+
+ +
+ +<% +//database connection +MySQLAccess myaccess = new MySQLAccess(); +//String userID = cookie implementation exists here. +//19 is just for testing purposes. Replaced by userID later. +RentedDevice[] mydevices = myaccess.getUserDevices("19"); +//string representation of array. +String deviceString = RentedDevice.arrayToString(mydevices); +%> + + + + + \ No newline at end of file diff --git a/WebContent/html/webpages/shoppingCart.html b/WebContent/html/webpages/shoppingCart.html index a2768b4..888fce9 100644 --- a/WebContent/html/webpages/shoppingCart.html +++ b/WebContent/html/webpages/shoppingCart.html @@ -1,90 +1,90 @@ - - - - - - - - - - Synchrony Financial - - - - - - - - - - - - - - -
- -
- -
-

Welcome to your shopping cart!

-
-
-
- - - - - - + + + + + + + + + + Synchrony Financial + + + + + + + + + + + + + + +
+ +
+ +
+

Welcome to your shopping cart!

+
+
+
+ + + + + + \ No newline at end of file diff --git a/db/Schema.mwb b/db/Schema.mwb index 0a7c874..327f832 100644 Binary files a/db/Schema.mwb and b/db/Schema.mwb differ diff --git a/db/Schema.mwb.bak b/db/Schema.mwb.bak index e66fc6e..dbf9d2b 100644 Binary files a/db/Schema.mwb.bak and b/db/Schema.mwb.bak differ diff --git a/db/db.sql b/db/db.sql index efed591..171be72 100644 --- a/db/db.sql +++ b/db/db.sql @@ -1,5 +1,5 @@ -- MySQL Script generated by MySQL Workbench --- 02/06/17 20:30:46 +-- 02/22/17 22:09:37 -- Model: New Model Version: 1.0 -- MySQL Workbench Forward Engineering @@ -134,8 +134,8 @@ CREATE TABLE IF NOT EXISTS `seniordesign`.`devices` ( `Renter` INT(11) NULL COMMENT 'Employee ID of whoever is renting out the device currently – can be null if nobody is renting it.', `Location` INT(11) NOT NULL COMMENT 'Storage if not rented, if rented the location COULD be different from the location listed under an employee’s records.\n\nIf missing, select location 5 - MISSING.', `Manufacturer` VARCHAR(45) NOT NULL COMMENT 'The company that produced this product.', - `Model_Type` VARCHAR(45) NOT NULL COMMENT 'Indicates general model. IE smartphone, tablet, etc.', - `Hardware_Model` VARCHAR(45) NOT NULL COMMENT 'What model the device is, specifically. IE iPad Air 2, iPhone SE, etc.', + `Hardware` VARCHAR(45) NOT NULL COMMENT 'Indicates general hardware. IE smartphone, tablet, etc.', + `Model` VARCHAR(45) NOT NULL COMMENT 'What model the device is, specifically. IE iPad Air 2, iPhone SE, etc.', `Serial_Num` VARCHAR(45) NULL COMMENT 'The serial number on the device. ', `Status` VARCHAR(45) NOT NULL COMMENT 'Describes the status of device. This may be available, rented, shipped, etc.', `Borrow_Date` VARCHAR(10) NULL COMMENT 'The date this device was borrowed.', @@ -318,198 +318,198 @@ COMMIT; -- ----------------------------------------------------- START TRANSACTION; USE `seniordesign`; -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (1, 'Chopped Liver', NULL, NULL, NULL, 9, 2, 'Samsung', 'Smartphone', 'Galaxy S5', 'G900AUCU2ANG3', 'Permanent', '12/16/2014', NULL, '12/16/2014', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (2, 'Dragons', NULL, NULL, NULL, 16, 2, 'Samsung', 'Tablet', 'Galaxy Tab S', 'R52FB15G9JK', 'Permanent', NULL, '4/29/2016', '1/5/2015', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (3, '201158', 'Pending Inactive (CSP). Device was left over from BC pilot and donated to lab by Jeff Gurr by way of Mike Cook. Device on permenant loan to DUX team.', NULL, NULL, 9, 2, 'Apple', 'Tablet', 'iPad 2', 'DN6GG8Y3DFJ1', 'Permanent', '9/10/2012', NULL, '9/10/2012', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (4, '201150', 'Pending Inactive (PSP). Device was left over from BC pilot and donated to lab by Jeff Gurr by way of Mike Cook. Device on permenant loan to DUX team.', NULL, NULL, 10, 2, 'Apple', 'Tablet', 'iPad 2', 'DMPGH23BDFJ1', 'Permanent', '9/10/2012', NULL, '9/10/2012', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (5, '201154', 'Device was left over from BC pilot and donated to lab by Jeff Gurr by way of Mike Cook. Device on permanent loan to DUX team. 8/13 -- Reactivate service on device .', NULL, NULL, 16, 2, 'Apple', 'Tablet', 'iPad 2', 'DN6GL1TSDFJ1', 'Permanent', '9/10/2012', NULL, '9/10/2012', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (6, 'Big', NULL, NULL, NULL, 9, 2, 'Apple', 'Smartphone', 'iPhone 6 Plus', 'FK2NPHJEG5QF', 'Permanent', '12/16/2014', NULL, '12/16/2014', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (7, 'Raiden', NULL, NULL, NULL, 9, 2, 'Motorola', 'Smartphone', 'Moto X (Black)', '00346NAECOM', 'Permanent', '12/16/2014', NULL, '12/16/2014', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (8, 'Kazoo', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Bold 9900', '2A753147', 'Available', NULL, NULL, '7/30/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (9, 'Julius', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Torch 9810', '28E4CEEE', 'Available', NULL, NULL, '7/30/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (10, 'Brutus', NULL, '3C:43:8E:2D:32:38', NULL, NULL, 1, 'Motorola', 'Smartphone', 'Droid RAZR', 'M786SC4GZF', 'Available', NULL, NULL, '7/30/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (11, 'Napoleon', NULL, 'F0:DC:E2:58:6E:D9', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 4S 16GB', 'C8PHLC5ADT9Y', 'Available', NULL, NULL, '7/26/2012', 14, '5/9/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (12, 'Spidey', NULL, 'A0:F4:19:F4:88:61', NULL, NULL, 1, 'Nokia', 'Smartphone', 'Lumia 800', 'IMEI: 352826050187956 ', 'Available', NULL, NULL, '7/30/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (13, 'Money Banks', NULL, NULL, NULL, NULL, 1, 'PayPal', 'N/A', 'N/A', 'N/A', 'Available', NULL, NULL, '8/1/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (14, 'Yesterday', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Bold 9930', '33211F4A', 'Available', NULL, NULL, '6/7/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (15, 'Christie', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Z10', '2AB64606', 'Available', NULL, NULL, '4/29/2013', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (16, 'Han Solo', NULL, NULL, NULL, NULL, 1, 'HP', 'Printer', 'Envy 110 e-All-in-One Printer D411', 'CN1AOC215Y', 'Available', NULL, NULL, '7/11/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (17, 'Vi', NULL, 'D8:B3:77:F4:72:0D', NULL, NULL, 1, 'HTC', 'Tablet', 'Evo View 4G', 'HT175HY03120', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (18, 'Infinite', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy Note 4', 'R38FB0FFPSV', 'Available', NULL, NULL, NULL, 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (19, 'Duff', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S 4', 'R38FA16EA8D', 'Available', NULL, NULL, '1/5/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (20, 'AMEE', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S2', 'R21C355NH6R', 'Removed', NULL, NULL, '6/12/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (21, 'Izzy', NULL, '1C:62:B8:A1:53:75', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S2 or Epic 4G Touch', 'A0000030E93807', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (22, '???', 'White', NULL, NULL, 12, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R38G30BYNAK', 'On Loan', NULL, NULL, '10/9/2016', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (23, 'Ham', NULL, NULL, NULL, 15, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R38G40HTGNP', 'On Loan', '4/25/2016', NULL, NULL, 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (24, 'Loki', NULL, 'BC:B1:F3:B5:4E:74', NULL, 2, 1, 'Samsung', 'Tablet', 'Galaxy Tab 3+', 'R32C2011DML', 'Available', '7/28/2015', '8/21/2016', '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (25, 'Dungeons', NULL, '64:B8:53:52:3A:DD', NULL, NULL, 1, 'Samsung', 'Tablet', 'Galaxy Tab S 8.4', 'R52FB0T3ZLT', 'Available', NULL, NULL, '1/5/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (26, 'Lenny', 'Device out of warranty. Device was damaged by 213006643 and removed from service. Device was wiped by 221028475 and Will be transferred to Compucom for disposal.', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad 2', 'DLX92F6DFJ1', 'Removed', NULL, NULL, '3/1/2012', 27, '4/20/2016', 27, NULL, '8/3/2012', 27, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (27, 'Steve', NULL, '78:CA:39:D0:04:66', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Gen 1', 'GB033QVVETU', 'Available', NULL, NULL, '6/7/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (28, 'Catfish', 'Reserved: 9/26/16 - 9/28/16', 'C8:F6:50:7C:E6:A6', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Mini Gen 2', 'F4KMW9QSFCM5', 'Available', NULL, NULL, '4/24/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (29, 'Pong', NULL, 'C0:F2:FB:32:0D:7A', NULL, 11, 1, 'Apple', 'Tablet', 'iPad Mini Gen 3', 'F4KN8JD6G5V2', 'Available', '8/12/2016', '9/9/2016', '4/24/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (30, 'Fireball', NULL, '68:D9:3C:31:1E:5E', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 5s', 'F17N20FGFFFK', 'Available', NULL, NULL, '6/1/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (31, 'Pitfall', 'Gold - Money 2020', 'F0:DB:E2:63:2C:8B', NULL, 3, 1, 'Apple', 'Smartphone', 'iPhone 6', 'DNXNP8BXG5MC', 'On Loan', '10/6/2016', '10/28/2016', '3/3/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (32, 'Will', 'Gold - Money 2020', '98:E0:D9:6E:4A:D8', NULL, 3, 1, 'Apple', 'Smartphone', 'iPhone 6', 'F18PC79CG5MD', 'On Loan', '10/6/2016', '10/28/2016', '4/1/2016', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (33, 'Bait', NULL, '90:8D:6C:90:7B:C6', NULL, 13, 1, 'Apple', 'Smartphone', 'iPhone 6 Plus', 'FK1NP13FG5QF', 'Available', '2/1/2016', '3/31/2016', '12/16/2014', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (34, 'Pixel', NULL, 'F4:1B:A1:C1:25:BC', NULL, NULL, 1, 'Apple', 'iPod Touch', 'iPod Touch 4th Gen', 'CCQHNDMLDT77', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (35, 'Dax', NULL, NULL, NULL, NULL, 1, 'Amazon', 'Kindle', 'Kindle Fire (1)', 'D01EA0A0208204DD', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (36, 'Epic', NULL, 'A8:44:81:AE:9B:18', NULL, 2, 1, 'Nokia', 'Smartphone', 'Lumia 920', 'IMEI: 353680053871770', 'Available', '7/28/2015', '8/21/2016', '5/6/2013', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (37, 'Trunk', NULL, 'EC:59:E7:70:3F:D4', NULL, NULL, 1, 'Nokia', 'Smartphone', 'Lumia 930', 'IMEI: 353633065964612', 'Available', NULL, NULL, '12/16/2014', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (38, 'Chewy', 'Transfered device and service plan to Randy', NULL, NULL, NULL, 1, 'AT&T Novatel Wireless', 'Mobile Hotspot', 'Mifi2372', 'NBZNRM-MIFI2372', 'Removed', NULL, NULL, '7/11/2012', 27, '4/20/2016', 27, NULL, '4/5/2016', 18, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (39, 'GE Capital', NULL, NULL, NULL, NULL, 1, 'Apple', 'Computer', 'Mini Gen 1', 'F7TLNGCSF196', 'Available', NULL, NULL, NULL, 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (40, 'Dhalism', NULL, '9C:D9:17:86:C0:EE', NULL, NULL, 1, 'Motorola', 'Smartphone', 'Moto X (2)', 'T141021N813', 'Available', NULL, NULL, '12/31/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (41, 'Drumpf', NULL, 'DC:EE:06:FD:8A:A3', NULL, NULL, 1, 'Huawei', 'Smartphone', 'Nexus 6P', 'ENU7N1626000241', 'Available', NULL, NULL, NULL, 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (42, 'The Situation', NULL, NULL, NULL, NULL, 1, 'Asus', 'Tablet', 'Nexus 7', 'C90KBC061641', 'Available', NULL, NULL, '12/18/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (43, 'Glover', NULL, '10:BF:48:18:60:6E', NULL, NULL, 1, 'Asus', 'Computer', 'Transformer', 'C50KAS020501', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (44, 'Greg', NULL, 'A0:02:DC:8A:25:40', NULL, NULL, 1, 'Amazon', 'Smartphone', 'Fire Phone', 'B0F107024285020D', 'Available', NULL, NULL, '8/6/2014', 29, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (45, 'Yoko Ono', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S5', '887276029375', 'Removed', NULL, NULL, '8/6/2014', 29, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (46, 'Baby', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Mini', 'F7NMVNH0FP84', 'Removed', NULL, NULL, '8/6/2014', 29, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (47, 'Neymar', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Motorola', 'Smartphone', 'Moto X', '56014456001', 'Removed', NULL, NULL, '8/6/2014', 29, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (48, 'E.B', NULL, NULL, NULL, NULL, 1, 'Mophie', 'Battery Pack', 'Battery Pack', 'x', 'Available', NULL, NULL, '9/23/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (49, 'Doc', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Q10', '2AF94159', 'Available', NULL, NULL, '8/28/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (50, 'Biff', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Z10', '2AE73B86', 'Available', NULL, NULL, '9/3/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (51, 'Hobbes', 'STOLEN. SC Case #: 124021350', 'F4:09:D8:D7:FB:3E', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S4', '359721059056372', 'Removed', NULL, NULL, '8/29/2013', 31, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (52, 'Stewart', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air', 'DMPLM2DGFK10', 'Removed', NULL, NULL, '12/10/2013', 31, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (53, 'Abercrombie', NULL, NULL, NULL, NULL, 4, 'Apple', 'Tablet', 'iPad 3', 'DMPH9UK4DVGG', 'Missing', NULL, NULL, '1/5/2015', 27, '10/12/2015', 37, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (54, 'Sausage & Gravy', NULL, NULL, NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 5s', 'C39MH9D5FF9R', 'Missing', NULL, NULL, '12/16/2014', 27, '10/12/2015', 37, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (55, 'Doom', NULL, NULL, NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6', 'F17NQ8YSG5MC', 'Missing', NULL, NULL, '4/24/2015', 27, '10/12/2015', 37, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (56, 'Jesse', 'Stolen. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'SmartTV', 'Apple TV', 'C0HMPSA2FFS4', 'Removed', NULL, NULL, '8/6/2014', 29, '10/12/2015', 37, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (57, 'Alpha', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Tablet', 'Galaxy Tab4', 'RF2F4126T2N', 'Missing', NULL, NULL, '8/6/2014', 29, '10/12/2015', 37, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (58, 'Biggie', 'Stolen. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Microsoft', 'Tablet', 'Surface Pro 3', '19390642553', 'Removed', NULL, NULL, '8/6/2014', 29, '10/12/2015', 37, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (59, 'Noodle', NULL, '34:23:BA:66:7C:22', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S3', '3575350023', 'Available', NULL, NULL, '9/18/2013', 31, '10/12/2015', 37, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (60, 'Larry', NULL, NULL, NULL, NULL, 1, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152GC83351', 'Missing', NULL, NULL, '8/9/2012', 33, '10/12/2015', 37, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (61, 'Minus', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air', 'DMRLL8P2FK10', 'Removed', NULL, NULL, '12/11/2013', 31, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (62, 'Guardian', NULL, '00:BB:3A:98:D0:EB', NULL, NULL, 1, 'Amazon', 'Kindle', 'Kindle Fire HDX (1)', 'D072A0A0343602KR', 'Available', NULL, NULL, '12/10/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (63, 'Frederik', NULL, '54:44:08:DA:07:50', NULL, NULL, 1, 'Nokia', 'Smartphone', 'Lumia 925', 'IMEI: 355519050502384', 'Available', NULL, NULL, '12/10/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (64, 'Swiper', NULL, NULL, NULL, NULL, 1, 'Motorola', 'Data Collection Terminal', 'MC40 Data Collection Terminal', '13133522500635', 'Permanent', NULL, NULL, '9/23/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (65, 'Page', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Asus', 'Tablet', 'Nexus 7', 'D70KBC524938', 'Removed', NULL, NULL, '12/10/2013', 31, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (66, 'Wilfork', NULL, NULL, NULL, 23, 1, 'Microsoft', 'Tablet', 'Surface Pro', '49026730853', 'Available', '2/1/2016', '5/19/2016', '8/23/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (67, 'McFly', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'BlackBerry Curve 8900', '20F3572B', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (68, 'Lumbergh', NULL, NULL, NULL, NULL, 1, 'RIM', 'Tablet', 'Blackberry Playbook', '1345-1805-7170', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (69, 'Mugatu', NULL, NULL, NULL, NULL, 1, 'Velocity Micro', 'Tablet', 'Cruz T408', '1A0200709408', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (70, 'Luke', NULL, NULL, NULL, NULL, 1, 'HP', 'Printer', 'Envy 110 e-All-in-One Printer D411', 'CN1AOC2162', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (71, 'Sentinel', NULL, NULL, NULL, NULL, 1, 'Amazon', 'Kindle', 'Kindle Touch 3G', 'B00F260714741X0P', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (72, 'Vader', NULL, NULL, NULL, 27, 1, 'Sierra Wireless', 'Mobile Hotspot', 'Mifi ', '12701002928306', 'On Loan', '4/20/2016', '6/1/2016', '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (73, 'Catherine', NULL, '1C:B0:94:38:8D:FF', NULL, NULL, 1, 'HTC', 'Smartphone', 'myTouch 4G Slide', 'HT22NTB01591', 'Available', NULL, NULL, '7/11/2012', 33, '5/9/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (74, 'Lando', NULL, NULL, NULL, NULL, 1, 'VeriFone', 'Payment Processor', 'PAYware Mobile Reader', '313526846', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (75, 'Simon', 'Permanent Loan to Sandy Muddappa', NULL, NULL, 20, 3, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081036GC01901', 'Permanent', '2/29/2016', NULL, '8/16/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (76, 'Otto', NULL, '10:1C:0C:01:B8:4E', NULL, 2, 1, 'Apple', 'Tablet', 'iPad Gen 4', 'DMPKHLJGF182', 'Available', '7/28/2015', '8/21/2016', '5/28/2013', 34, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (77, 'Testudo', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Mini', 'F4NKFJU6F196', 'Removed', NULL, NULL, '5/28/2013', 34, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (78, 'Toto', NULL, 'F4:1B:A1:C1:25:BC', NULL, NULL, 1, 'Apple', 'iPod Touch', 'iPod Touch 5th Gen', 'CCQK22ADF4K4', 'Available', NULL, NULL, '5/28/2013', 34, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (79, 'Digby', NULL, NULL, NULL, 24, 1, 'Apple', 'Computer', 'Mac Mini', 'C07J69G4DJD0', 'Available', '6/15/2015', '12/31/2015', '5/28/2013', 34, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (80, 'Seoul', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy Note 3', 'R38FA06FPWE', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (81, 'Loop', NULL, 'C0:BD:D1:1E:9A:F8', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy Note 4', 'R38FB04AHEN', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (82, 'Salmon', NULL, '94:76:B7:2B:D9:1B', NULL, 5, 1, 'Samsung', 'Smartphone', 'Galaxy S 7', 'R39H30D7N1H', 'On Loan', '9/1/2016', '9/8/2016', NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (83, 'M2020A', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58G51CG9LT', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (84, 'M2020B', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58G51CG9JW', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (85, 'Shark Bait', 'Gold - Money 2020', '5C:AD:CF:D0:56:17', NULL, 3, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPQM9DWG5VT', 'On Loan', '10/6/2016', '10/28/2016', NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (86, 'The Bern', NULL, '64:BC:0C:43:14:09', NULL, NULL, 1, 'LG', 'Smartphone', 'Nexus 5X', '00c643748a4d404c', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (87, 'Scooby', NULL, NULL, NULL, 10, 2, 'Sony', 'Camera', 'Bloggie Touch MHS-TS20', '1687101', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (88, 'George', NULL, NULL, NULL, 10, 2, 'Apple', 'Smartphone', 'iPhone 4S', 'C8PHLAMXDT9Y', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (89, 'John', NULL, NULL, NULL, 10, 2, 'Apple', 'Smartphone', 'iPhone 4S', 'C8PHLC24DT9Y', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (90, 'Paul', NULL, NULL, NULL, 10, 2, 'Apple', 'Smartphone', 'iPhone 4S', 'C8PHLC3SDT9Y', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (91, 'Katniss', NULL, NULL, NULL, 10, 2, 'Amazon', 'Kindle', 'Kindle Fire', 'FSN D01EA0A020852085218', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (92, 'Fred', NULL, NULL, NULL, 10, 2, 'Nokia', 'Smartphone', 'Lumia 800', 'x', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (93, 'Daphne', NULL, NULL, NULL, 10, 2, 'Panasonic', 'Camera', 'Lumix DMC-FH8', 'WP2CBB002027', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (94, 'Peeta', NULL, NULL, NULL, 10, 2, 'HTC', 'Smartphone', 'One', 'HT252W402718', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (95, 'Alvin', NULL, NULL, NULL, 10, 2, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152gc83353', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (96, 'Theodore', NULL, NULL, NULL, 10, 2, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152gc83354', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (97, 'Gale', NULL, NULL, NULL, 10, 2, 'Motorola', 'Smartphone', 'Razr XT-910', 'CHWG3237AB', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (98, 'Thing 1', NULL, NULL, NULL, 10, 2, 'SanDisk', 'Storage Device', 'SD Card', 'x', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (99, 'Thing 2', NULL, NULL, NULL, 10, 2, 'SanDisk', 'Storage Device', 'SD Card', 'x', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (100, 'Big Bertha', 'OTP Phone', '00:37:6D:21:2E:DD', NULL, 14, 1, 'Samsung', 'Smartphone', 'Galaxy Note', 'R21C65AFTQW', 'Permanent', '7/26/2012', '5/6/2016', '7/26/2012', 14, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (101, 'Becky', NULL, '68:D9:3C:84:8A:12', NULL, NULL, 1, 'Apple', 'SmartTV', 'Apple TV', 'F6MNF1DJFF54', 'Available', NULL, NULL, '4/21/2015', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (102, 'Skolnick', NULL, '68:D9:3C:8D:FA:B2', NULL, NULL, 1, 'Apple', 'SmartTV', 'Apple TV', 'F6MNF1U9FF54', 'Available', NULL, NULL, '4/21/2015', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (103, 'Miner', NULL, '10:A5:D0:E2:B2:BB', NULL, 5, 1, 'Samsung', 'Smartphone', 'Galaxy S5', 'G900VVRU1ANCG', 'On Loan', '8/9/2016', '8/19/2016', '3/3/2015', 27, NULL, NULL, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (104, 'Abhijit', NULL, NULL, NULL, 1, 1, 'Samsung', 'Smartphone', 'Galaxy S7', 'R58H42DMZPW', 'Permanent', '5/9/2016', NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (105, 'Bob', 'Pending Inactive (PSP). 4/5/16', NULL, NULL, 17, 1, 'Apple', 'Tablet', 'iPad', 'DMPH9KGTDVGG', 'Permanent', '3/17/2012', '7/28/2016', '3/17/2012', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (106, 'Abigail', NULL, NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad 2', 'DMPG832HDFJ1', 'Missing', NULL, NULL, '3/17/2012', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (107, 'Greyson', NULL, NULL, NULL, 2, 1, 'Apple', 'Tablet', 'iPad Pro 1', 'DLXQR0SNGMLF', 'On Loan', '4/1/2016', '6/1/2016', '4/1/2016', 27, NULL, NULL, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (108, 'Kizzy', NULL, '5C:97:F3:4E:F1:12', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 5s', 'DX3NLA7NFNJJ', 'Available', NULL, NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (109, 'Uniamious', NULL, NULL, NULL, 1, 1, 'Apple', 'Smartphone', 'iPhone 6s', 'F18R4PF7GRYS', 'Permanent', '5/12/2016', NULL, '5/12/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (110, 'Powerthirst', NULL, NULL, NULL, NULL, 1, 'Apple', 'Computer', 'Macbook Pro', 'C02FR71LDF8V', 'Available', NULL, NULL, '8/6/2012', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (111, 'Kramer', NULL, NULL, NULL, 1, 1, 'Huawei', 'Smartphone', 'Nexus 6P', '84B7N16411005162', 'Permanent', '5/9/2016', NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (112, 'Mastercast', NULL, NULL, NULL, 25, 1, 'Symbol', 'Computer', 'TC70', '16047522503130', 'On Loan', '5/9/2016', NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (113, 'Anant', NULL, NULL, NULL, 1, 1, 'Apple', 'Watch', 'Watch', 'FH7RJ0T3GR7N', 'Permanent', '5/9/2016', NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (114, 'Walt', NULL, NULL, NULL, NULL, 1, 'Apple', 'SmartTV', 'Apple TV', 'C0HMPSA2FFS4', 'Available', NULL, NULL, '8/6/2014', 29, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (115, 'Pink', NULL, NULL, NULL, 2, 1, 'Apple', 'Tablet', 'iPad Air', 'DLXMYCM1FK10', 'On Loan', '11/2/2015', NULL, '8/6/2014', 29, NULL, NULL, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (116, 'Summer', 'Gold - Money 2020', '78:FD:94:7F:15:AB', NULL, 3, 1, 'Apple', 'Tablet', 'iPad Air', 'DLXMXK7CFK10', 'On Loan', '10/6/2016', '10/28/2016', '8/6/2014', 29, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (117, 'Patton', NULL, '50:F5:DA:0D:85:D5', NULL, 19, 1, 'Amazon', 'Speaker', 'Echo', '90F00718631205P5', 'Permanent ', NULL, NULL, '8/24/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (118, 'Eisenhower', NULL, '50:F5:DA:68:55:F4', NULL, 19, 1, 'Amazon ', 'Speaker', 'Echo', '90F007186312064M', 'Permanent', NULL, NULL, '8/24/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (119, 'Brick', NULL, '80:A5:89:7E:64:73', NULL, NULL, 1, 'Asus', 'Storage Device', 'Chromebit', 'FCMACX007717', 'Available', NULL, NULL, '9/1/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (120, 'Captain America', 'Retail Forum', '00:21:5C:F0:33:09', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC61700EM2', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (121, 'Iron Man', 'Retail Forum', '00:21:5C:EF:7252', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC61900DZ4', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (122, 'Hulk', 'Retail Forum', '00:21:5C:F0:54:D8', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC619006TJ', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (123, 'Thor', 'Retail Forum', '00:21:5C:EF:85:5D', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC61900DG2', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (124, 'Black Widow', 'Retail Forum', '00:21:5C:EF:9B:56', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC6190079T', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (125, 'Hawkeye', 'Retail Forum', '00:21:5C:EF:BD:D9', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC6190064H', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (126, 'Bojack', NULL, NULL, NULL, 19, 1, 'Samsung', 'Smartphone', 'Galaxy S7 Edge', 'RF8H90SP7EN', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (127, 'Varys', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMPM5CFKFK14', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (128, 'Tormund', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMPM4F3QFK14', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (129, 'Brienne', NULL, NULL, NULL, 19, 1, 'Apple ', 'Tabet', 'iPad Air', 'DMPMKML6FK10', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (130, 'Obeyrn', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMPPNJ22FK10', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (131, 'Tywin', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad AIr', 'DMRM7FNAFK10', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (132, 'Jojen', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMRMRJN3FK10', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (133, 'Petyr', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMVLXWXHFK14', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (134, 'Hodor', NULL, '98:E0:D9:D1:63:11', NULL, NULL, 1, 'Apple ', 'Tablet', 'iPad Air', 'DMPPNQE6FK10', '???', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (135, 'Milli Vanilli', NULL, 'C0:F2:FB:85:D5:67', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Mini Gen 3', 'F4KN94WLG5V2', 'Available', NULL, NULL, '8/22/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (136, 'Apollo', NULL, '0C:D7;46:60:FE:68', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6S Plus', 'F2LQT5NGGRWF', '???', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (137, 'Hermes', NULL, '84:A1:34:56:B8:87', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6S Plus', 'F2LRR137GRWF', '???', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (138, 'Hades', 'Retail Forum', 'C0:CC:F8:95:B8:C6', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6s Plus', 'C39R41XUGRWY', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (139, 'Finch', 'Retail Forum/SSID: NETGEAR80/Pass:silentfinch310', '10:DA:43:12:05:5D', NULL, NULL, 1, 'Netgear', 'Router', 'N750 Wireless Router', '3XB2665901661', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (140, 'Earth', 'Retail Forum/SSID: NETGEAR02/Pass:hungryearth555', '10:DA:43:12:05:75', NULL, NULL, 1, 'Netgear', 'Router', 'N750 Wireless Router', '3XB2665H01669', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (141, 'Plum', 'Retail Forum/SSID: NETGEAR18/Pass:festiveplum661', '10:DA::43:12:2A:EC', NULL, NULL, 1, 'Netgear', 'Router', 'N750 Wireless Router', '3XB2665N022E6', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (142, 'Frogger', NULL, '54:A0:50:96:50:D7', NULL, NULL, 1, 'Asus', 'Tablet', 'Nexus 7', '0b000a3a', 'Available', NULL, NULL, '8/22/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (143, 'Astroids', NULL, '54:A0:50:96:51:EF', NULL, NULL, 1, 'Asus ', 'Tablet', 'Nexus 7', '0a819e4b', 'Available', NULL, NULL, '8/22/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (144, 'Morty', NULL, NULL, NULL, 21, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58H716YJBZ', 'On Loan', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (145, 'Rick', NULL, '4C:66:41:5A:CB:BE', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58H716YJ0W', 'Available', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (146, 'Pearl Jam', 'Reserved: 9/26/16 - 9/28/16', '24:A0:74:4E:0A:F9', NULL, 8, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DLXNHY8KG5VV', 'Available', '9/16/2016', '9/28/2016', '8/22/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (147, 'Sansa', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60S2G5VJ', 'Permanent', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (148, 'Bran', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMQS5ALFG5VJ', 'Permanent', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (149, 'Jon', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS609SG5VJ', 'Permanent', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (150, 'Melisandre', NULL, 'EC:AD:B8:66:A2:0C', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60BTG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (151, 'Sandor', NULL, 'EC:AD:B8:66:16:6E', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS603AG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (152, 'Samwell', NULL, 'EC:AD:B8:66:24:D5', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60UFG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (153, 'Arya', NULL, 'EC:AD:B8:65:33:4F', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMQS5V2CG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (154, 'PatchFace', NULL, 'EC:AD:B8:65:42:5B', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60X7G5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (155, 'Theon', NULL, 'EC:AD:B8:65:C3:D3', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS63ASG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (156, 'Daenerys', NULL, 'EC:AD:B8:65:4A:35', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS62XPG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (157, 'Cersei', NULL, 'EC:AD:B8:66:0C:E1', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60KXG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (158, 'Jaime', NULL, 'EC:AD:B8:65:4B:44', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS63F3G5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (159, 'Tyrion', NULL, NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS6022G5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (160, 'Bronn', NULL, 'EC:AD:B8:66:A0:1A', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS63CJG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (161, 'Davos', NULL, 'EC:AD:B8:66:7F:35', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60U6G5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (162, 'Zeus', 'Retail Forum', '40:33:1A:DB:43:5E', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6s Plus', 'C39QD0EGGRWH', 'Permanent', NULL, NULL, '8/24/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (163, 'Poseidon', NULL, '40:33:1A:D4:99:41', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6s Plus', 'F2LQD0ZMGRWH', '???', NULL, NULL, '8/24/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (164, 'Calvin', NULL, '40:0E:85:14:A4:E0', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S4', '357086050754041', 'Available', NULL, NULL, '8/29/2013', 31, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (165, 'Connors', NULL, NULL, NULL, NULL, 1, 'Lenovo', 'Computer', 'IdeaPad S400 Touch', 'CB26929928', 'Available', NULL, NULL, '12/10/2013', 31, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (166, 'Nittany', NULL, NULL, NULL, 2, 1, 'Microsoft', 'Tablet', 'Surface RT', '24959630352', 'On Loan', '11/2/2015', NULL, '8/23/2013', 31, NULL, NULL, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (167, 'T1000', NULL, NULL, NULL, NULL, 1, 'Lenovo', 'Computer', 'ThinkPad S230u', '3347-2', 'Available', NULL, NULL, '12/10/2013', 31, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (168, 'Bacon', 'Stolen. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Computer', 'MacBook Pro', 'C02J9A8EDV33', 'Removed', NULL, NULL, '1/16/2013', 32, NULL, NULL, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (169, 'Snow', NULL, NULL, NULL, 26, 1, 'Apple', 'Tablet', 'iPad', 'DMQHP1NXDVD1', 'On Loan', '7/11/2012', '6/30/2015', '7/11/2012', 33, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (170, 'Ringo', NULL, NULL, NULL, 10, 2, 'Apple', 'Tablet', 'iPad HD', 'DMPHR4ZQDVD1', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, NULL, NULL, '4/21/2016', NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (171, 'Joule', NULL, 'E4:CE:8F:21:6C:94', NULL, 7, 1, 'Apple', 'Computer', 'MacBook Pro', 'C02FR72LDF8V', 'Permanent', NULL, NULL, '8/14/2012', 33, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (172, 'Leia', NULL, NULL, NULL, 18, 3, 'AT&T Novatel Wireless', 'Mobile Hotspot', 'Mifi2372', 'NBZNRM-MIFI2372', 'Removed', NULL, NULL, '7/11/2012', 33, NULL, NULL, NULL, '4/5/2016', 18, 27); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (173, 'Curly', NULL, NULL, NULL, NULL, 1, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152GC8357', 'Available', NULL, NULL, '8/9/2012', 33, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (174, 'Moe', 'Stolen. SC Case #: 124021350', NULL, NULL, NULL, 1, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152GC83360', 'Removed', NULL, NULL, '8/9/2012', 33, NULL, NULL, NULL, '12/5/2014', 35, 36); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (175, 'M2020C', 'White', NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Galaxy S6', NULL, 'Missing', NULL, NULL, '10/9/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (176, 'M2020D', 'White', NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Galaxy S6', NULL, 'Missing', NULL, NULL, '10/9/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (177, 'M2020E', 'Black SM-G920i - Money 2020', 'E8:50:8B:BD:AD:20', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58G50QZVDB', 'Available', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (178, '???', 'Black SM-G920i - Money 2020', NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Galaxy S6', NULL, 'Missing', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (179, 'Linkin Park', NULL, NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', NULL, 'DOA', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (180, '???', NULL, NULL, NULL, NULL, 5, 'Apple', 'Smartphone', 'iPhone 5', NULL, 'Missing', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (181, 'Krupa', NULL, 'C8:1E:E7:7E:08:1A', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6', 'F18PM3ZKG5MF', 'Available', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (182, 'Rich', NULL, '78:7E:61:46:62:FC', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6', 'F6WNH1SGG5MF', 'Available', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (183, 'Williams', NULL, 'D4:F4:6F:A0:DD:B0', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6', 'DNPNDTRPG5MF', 'Available', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (184, '???', 'Gold - Money 2020', NULL, NULL, NULL, 5, 'Apple', 'Smartphone', 'iPhone 6', NULL, 'Missing', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (185, 'Tommy (Green)', 'iOS App Challenge', 'AC:BC:32:8F:0C:BD', NULL, 4, 1, 'Apple', 'Computer', 'MacBook Pro Retina', 'C02Q90VMG8WN', 'Permanent', '9/19/2016', '1/1/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (186, 'Kimberly (Pink)', 'iOS App Challenge', 'AC:BC:32:87:3E:4F', NULL, 6, 1, 'Apple', 'Computer', 'MacBook Pro Retina', 'C02Q8C73G8WN', 'Permanent', '9/19/2016', '1/1/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (187, 'Jason (Red)', 'iOS App Challenge', 'AC:BC:32:8F:71:13', NULL, 22, 1, 'Apple', 'Computer', 'MacBook Pro Retina', 'C02Q90N2G8WN', 'Permanent', '9/19/2016', '1/1/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (188, 'Zack (Black)', 'iOS App Challenge', 'AC:BC:32:8E:B3:CB', NULL, 28, 1, 'Apple', 'Computer', 'MacBook Pro Retina', 'C02Q909WG8WN', 'Permanent', '9/19/2016', '1/1/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (189, '???', NULL, NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Note 4', NULL, 'Missing', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (190, '???', NULL, NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Note 4', NULL, 'Missing', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (191, '???', NULL, NULL, NULL, NULL, 1, 'Cradlepoint', 'N/A', 'N/A', NULL, 'TBD', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Model_Type`, `Hardware_Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (192, '???', NULL, NULL, NULL, NULL, 1, 'Cradlepoint', 'N/A', 'N/A', NULL, 'Broken', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (1, 'Chopped Liver', NULL, NULL, NULL, 9, 2, 'Samsung', 'Smartphone', 'Galaxy S5', 'G900AUCU2ANG3', 'Permanent', '12/16/2014', NULL, '12/16/2014', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (2, 'Dragons', NULL, NULL, NULL, 16, 2, 'Samsung', 'Tablet', 'Galaxy Tab S', 'R52FB15G9JK', 'Permanent', NULL, '4/29/2016', '1/5/2015', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (3, '201158', 'Pending Inactive (CSP). Device was left over from BC pilot and donated to lab by Jeff Gurr by way of Mike Cook. Device on permenant loan to DUX team.', NULL, NULL, 9, 2, 'Apple', 'Tablet', 'iPad 2', 'DN6GG8Y3DFJ1', 'Permanent', '9/10/2012', NULL, '9/10/2012', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (4, '201150', 'Pending Inactive (PSP). Device was left over from BC pilot and donated to lab by Jeff Gurr by way of Mike Cook. Device on permenant loan to DUX team.', NULL, NULL, 10, 2, 'Apple', 'Tablet', 'iPad 2', 'DMPGH23BDFJ1', 'Permanent', '9/10/2012', NULL, '9/10/2012', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (5, '201154', 'Device was left over from BC pilot and donated to lab by Jeff Gurr by way of Mike Cook. Device on permanent loan to DUX team. 8/13 -- Reactivate service on device .', NULL, NULL, 16, 2, 'Apple', 'Tablet', 'iPad 2', 'DN6GL1TSDFJ1', 'Permanent', '9/10/2012', NULL, '9/10/2012', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (6, 'Big', NULL, NULL, NULL, 9, 2, 'Apple', 'Smartphone', 'iPhone 6 Plus', 'FK2NPHJEG5QF', 'Permanent', '12/16/2014', NULL, '12/16/2014', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (7, 'Raiden', NULL, NULL, NULL, 9, 2, 'Motorola', 'Smartphone', 'Moto X (Black)', '00346NAECOM', 'Permanent', '12/16/2014', NULL, '12/16/2014', 27, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (8, 'Kazoo', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Bold 9900', '2A753147', 'Available', NULL, NULL, '7/30/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (9, 'Julius', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Torch 9810', '28E4CEEE', 'Available', NULL, NULL, '7/30/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (10, 'Brutus', NULL, '3C:43:8E:2D:32:38', NULL, NULL, 1, 'Motorola', 'Smartphone', 'Droid RAZR', 'M786SC4GZF', 'Available', NULL, NULL, '7/30/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (11, 'Napoleon', NULL, 'F0:DC:E2:58:6E:D9', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 4S 16GB', 'C8PHLC5ADT9Y', 'Available', NULL, NULL, '7/26/2012', 14, '5/9/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (12, 'Spidey', NULL, 'A0:F4:19:F4:88:61', NULL, NULL, 1, 'Nokia', 'Smartphone', 'Lumia 800', 'IMEI: 352826050187956 ', 'Available', NULL, NULL, '7/30/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (13, 'Money Banks', NULL, NULL, NULL, NULL, 1, 'PayPal', 'N/A', 'N/A', 'N/A', 'Available', NULL, NULL, '8/1/2012', 14, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (14, 'Yesterday', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Bold 9930', '33211F4A', 'Available', NULL, NULL, '6/7/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (15, 'Christie', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Z10', '2AB64606', 'Available', NULL, NULL, '4/29/2013', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (16, 'Han Solo', NULL, NULL, NULL, NULL, 1, 'HP', 'Printer', 'Envy 110 e-All-in-One Printer D411', 'CN1AOC215Y', 'Available', NULL, NULL, '7/11/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (17, 'Vi', NULL, 'D8:B3:77:F4:72:0D', NULL, NULL, 1, 'HTC', 'Tablet', 'Evo View 4G', 'HT175HY03120', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (18, 'Infinite', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy Note 4', 'R38FB0FFPSV', 'Available', NULL, NULL, NULL, 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (19, 'Duff', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S 4', 'R38FA16EA8D', 'Available', NULL, NULL, '1/5/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (20, 'AMEE', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S2', 'R21C355NH6R', 'Removed', NULL, NULL, '6/12/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (21, 'Izzy', NULL, '1C:62:B8:A1:53:75', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S2 or Epic 4G Touch', 'A0000030E93807', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (22, '???', 'White', NULL, NULL, 12, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R38G30BYNAK', 'On Loan', NULL, NULL, '10/9/2016', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (23, 'Ham', NULL, NULL, NULL, 15, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R38G40HTGNP', 'On Loan', '4/25/2016', NULL, NULL, 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (24, 'Loki', NULL, 'BC:B1:F3:B5:4E:74', NULL, 2, 1, 'Samsung', 'Tablet', 'Galaxy Tab 3+', 'R32C2011DML', 'Available', '7/28/2015', '8/21/2016', '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (25, 'Dungeons', NULL, '64:B8:53:52:3A:DD', NULL, NULL, 1, 'Samsung', 'Tablet', 'Galaxy Tab S 8.4', 'R52FB0T3ZLT', 'Available', NULL, NULL, '1/5/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (26, 'Lenny', 'Device out of warranty. Device was damaged by 213006643 and removed from service. Device was wiped by 221028475 and Will be transferred to Compucom for disposal.', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad 2', 'DLX92F6DFJ1', 'Removed', NULL, NULL, '3/1/2012', 27, '4/20/2016', 27, NULL, '8/3/2012', 27, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (27, 'Steve', NULL, '78:CA:39:D0:04:66', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Gen 1', 'GB033QVVETU', 'Available', NULL, NULL, '6/7/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (28, 'Catfish', 'Reserved: 9/26/16 - 9/28/16', 'C8:F6:50:7C:E6:A6', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Mini Gen 2', 'F4KMW9QSFCM5', 'Available', NULL, NULL, '4/24/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (29, 'Pong', NULL, 'C0:F2:FB:32:0D:7A', NULL, 11, 1, 'Apple', 'Tablet', 'iPad Mini Gen 3', 'F4KN8JD6G5V2', 'Available', '8/12/2016', '9/9/2016', '4/24/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (30, 'Fireball', NULL, '68:D9:3C:31:1E:5E', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 5s', 'F17N20FGFFFK', 'Available', NULL, NULL, '6/1/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (31, 'Pitfall', 'Gold - Money 2020', 'F0:DB:E2:63:2C:8B', NULL, 3, 1, 'Apple', 'Smartphone', 'iPhone 6', 'DNXNP8BXG5MC', 'On Loan', '10/6/2016', '10/28/2016', '3/3/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (32, 'Will', 'Gold - Money 2020', '98:E0:D9:6E:4A:D8', NULL, 3, 1, 'Apple', 'Smartphone', 'iPhone 6', 'F18PC79CG5MD', 'On Loan', '10/6/2016', '10/28/2016', '4/1/2016', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (33, 'Bait', NULL, '90:8D:6C:90:7B:C6', NULL, 13, 1, 'Apple', 'Smartphone', 'iPhone 6 Plus', 'FK1NP13FG5QF', 'Available', '2/1/2016', '3/31/2016', '12/16/2014', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (34, 'Pixel', NULL, 'F4:1B:A1:C1:25:BC', NULL, NULL, 1, 'Apple', 'iPod Touch', 'iPod Touch 4th Gen', 'CCQHNDMLDT77', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (35, 'Dax', NULL, NULL, NULL, NULL, 1, 'Amazon', 'Kindle', 'Kindle Fire (1)', 'D01EA0A0208204DD', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (36, 'Epic', NULL, 'A8:44:81:AE:9B:18', NULL, 2, 1, 'Nokia', 'Smartphone', 'Lumia 920', 'IMEI: 353680053871770', 'Available', '7/28/2015', '8/21/2016', '5/6/2013', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (37, 'Trunk', NULL, 'EC:59:E7:70:3F:D4', NULL, NULL, 1, 'Nokia', 'Smartphone', 'Lumia 930', 'IMEI: 353633065964612', 'Available', NULL, NULL, '12/16/2014', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (38, 'Chewy', 'Transfered device and service plan to Randy', NULL, NULL, NULL, 1, 'AT&T Novatel Wireless', 'Mobile Hotspot', 'Mifi2372', 'NBZNRM-MIFI2372', 'Removed', NULL, NULL, '7/11/2012', 27, '4/20/2016', 27, NULL, '4/5/2016', 18, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (39, 'GE Capital', NULL, NULL, NULL, NULL, 1, 'Apple', 'Computer', 'Mini Gen 1', 'F7TLNGCSF196', 'Available', NULL, NULL, NULL, 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (40, 'Dhalism', NULL, '9C:D9:17:86:C0:EE', NULL, NULL, 1, 'Motorola', 'Smartphone', 'Moto X (2)', 'T141021N813', 'Available', NULL, NULL, '12/31/2015', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (41, 'Drumpf', NULL, 'DC:EE:06:FD:8A:A3', NULL, NULL, 1, 'Huawei', 'Smartphone', 'Nexus 6P', 'ENU7N1626000241', 'Available', NULL, NULL, NULL, 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (42, 'The Situation', NULL, NULL, NULL, NULL, 1, 'Asus', 'Tablet', 'Nexus 7', 'C90KBC061641', 'Available', NULL, NULL, '12/18/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (43, 'Glover', NULL, '10:BF:48:18:60:6E', NULL, NULL, 1, 'Asus', 'Computer', 'Transformer', 'C50KAS020501', 'Available', NULL, NULL, '6/6/2012', 27, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (44, 'Greg', NULL, 'A0:02:DC:8A:25:40', NULL, NULL, 1, 'Amazon', 'Smartphone', 'Fire Phone', 'B0F107024285020D', 'Available', NULL, NULL, '8/6/2014', 29, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (45, 'Yoko Ono', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S5', '887276029375', 'Removed', NULL, NULL, '8/6/2014', 29, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (46, 'Baby', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Mini', 'F7NMVNH0FP84', 'Removed', NULL, NULL, '8/6/2014', 29, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (47, 'Neymar', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Motorola', 'Smartphone', 'Moto X', '56014456001', 'Removed', NULL, NULL, '8/6/2014', 29, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (48, 'E.B', NULL, NULL, NULL, NULL, 1, 'Mophie', 'Battery Pack', 'Battery Pack', 'x', 'Available', NULL, NULL, '9/23/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (49, 'Doc', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Q10', '2AF94159', 'Available', NULL, NULL, '8/28/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (50, 'Biff', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'Blackberry Z10', '2AE73B86', 'Available', NULL, NULL, '9/3/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (51, 'Hobbes', 'STOLEN. SC Case #: 124021350', 'F4:09:D8:D7:FB:3E', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S4', '359721059056372', 'Removed', NULL, NULL, '8/29/2013', 31, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (52, 'Stewart', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air', 'DMPLM2DGFK10', 'Removed', NULL, NULL, '12/10/2013', 31, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (53, 'Abercrombie', NULL, NULL, NULL, NULL, 4, 'Apple', 'Tablet', 'iPad 3', 'DMPH9UK4DVGG', 'Missing', NULL, NULL, '1/5/2015', 27, '10/12/2015', 37, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (54, 'Sausage & Gravy', NULL, NULL, NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 5s', 'C39MH9D5FF9R', 'Missing', NULL, NULL, '12/16/2014', 27, '10/12/2015', 37, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (55, 'Doom', NULL, NULL, NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6', 'F17NQ8YSG5MC', 'Missing', NULL, NULL, '4/24/2015', 27, '10/12/2015', 37, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (56, 'Jesse', 'Stolen. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'SmartTV', 'Apple TV', 'C0HMPSA2FFS4', 'Removed', NULL, NULL, '8/6/2014', 29, '10/12/2015', 37, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (57, 'Alpha', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Tablet', 'Galaxy Tab4', 'RF2F4126T2N', 'Missing', NULL, NULL, '8/6/2014', 29, '10/12/2015', 37, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (58, 'Biggie', 'Stolen. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Microsoft', 'Tablet', 'Surface Pro 3', '19390642553', 'Removed', NULL, NULL, '8/6/2014', 29, '10/12/2015', 37, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (59, 'Noodle', NULL, '34:23:BA:66:7C:22', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S3', '3575350023', 'Available', NULL, NULL, '9/18/2013', 31, '10/12/2015', 37, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (60, 'Larry', NULL, NULL, NULL, NULL, 1, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152GC83351', 'Missing', NULL, NULL, '8/9/2012', 33, '10/12/2015', 37, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (61, 'Minus', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air', 'DMRLL8P2FK10', 'Removed', NULL, NULL, '12/11/2013', 31, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (62, 'Guardian', NULL, '00:BB:3A:98:D0:EB', NULL, NULL, 1, 'Amazon', 'Kindle', 'Kindle Fire HDX (1)', 'D072A0A0343602KR', 'Available', NULL, NULL, '12/10/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (63, 'Frederik', NULL, '54:44:08:DA:07:50', NULL, NULL, 1, 'Nokia', 'Smartphone', 'Lumia 925', 'IMEI: 355519050502384', 'Available', NULL, NULL, '12/10/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (64, 'Swiper', NULL, NULL, NULL, NULL, 1, 'Motorola', 'Data Collection Terminal', 'MC40 Data Collection Terminal', '13133522500635', 'Permanent', NULL, NULL, '9/23/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (65, 'Page', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Asus', 'Tablet', 'Nexus 7', 'D70KBC524938', 'Removed', NULL, NULL, '12/10/2013', 31, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (66, 'Wilfork', NULL, NULL, NULL, 23, 1, 'Microsoft', 'Tablet', 'Surface Pro', '49026730853', 'Available', '2/1/2016', '5/19/2016', '8/23/2013', 31, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (67, 'McFly', NULL, NULL, NULL, NULL, 1, 'RIM', 'Smartphone', 'BlackBerry Curve 8900', '20F3572B', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (68, 'Lumbergh', NULL, NULL, NULL, NULL, 1, 'RIM', 'Tablet', 'Blackberry Playbook', '1345-1805-7170', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (69, 'Mugatu', NULL, NULL, NULL, NULL, 1, 'Velocity Micro', 'Tablet', 'Cruz T408', '1A0200709408', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (70, 'Luke', NULL, NULL, NULL, NULL, 1, 'HP', 'Printer', 'Envy 110 e-All-in-One Printer D411', 'CN1AOC2162', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (71, 'Sentinel', NULL, NULL, NULL, NULL, 1, 'Amazon', 'Kindle', 'Kindle Touch 3G', 'B00F260714741X0P', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (72, 'Vader', NULL, NULL, NULL, 27, 1, 'Sierra Wireless', 'Mobile Hotspot', 'Mifi ', '12701002928306', 'On Loan', '4/20/2016', '6/1/2016', '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (73, 'Catherine', NULL, '1C:B0:94:38:8D:FF', NULL, NULL, 1, 'HTC', 'Smartphone', 'myTouch 4G Slide', 'HT22NTB01591', 'Available', NULL, NULL, '7/11/2012', 33, '5/9/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (74, 'Lando', NULL, NULL, NULL, NULL, 1, 'VeriFone', 'Payment Processor', 'PAYware Mobile Reader', '313526846', 'Available', NULL, NULL, '7/11/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (75, 'Simon', 'Permanent Loan to Sandy Muddappa', NULL, NULL, 20, 3, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081036GC01901', 'Permanent', '2/29/2016', NULL, '8/16/2012', 33, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (76, 'Otto', NULL, '10:1C:0C:01:B8:4E', NULL, 2, 1, 'Apple', 'Tablet', 'iPad Gen 4', 'DMPKHLJGF182', 'Available', '7/28/2015', '8/21/2016', '5/28/2013', 34, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (77, 'Testudo', 'STOLEN. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Mini', 'F4NKFJU6F196', 'Removed', NULL, NULL, '5/28/2013', 34, '4/20/2016', 27, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (78, 'Toto', NULL, 'F4:1B:A1:C1:25:BC', NULL, NULL, 1, 'Apple', 'iPod Touch', 'iPod Touch 5th Gen', 'CCQK22ADF4K4', 'Available', NULL, NULL, '5/28/2013', 34, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (79, 'Digby', NULL, NULL, NULL, 24, 1, 'Apple', 'Computer', 'Mac Mini', 'C07J69G4DJD0', 'Available', '6/15/2015', '12/31/2015', '5/28/2013', 34, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (80, 'Seoul', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy Note 3', 'R38FA06FPWE', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (81, 'Loop', NULL, 'C0:BD:D1:1E:9A:F8', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy Note 4', 'R38FB04AHEN', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (82, 'Salmon', NULL, '94:76:B7:2B:D9:1B', NULL, 5, 1, 'Samsung', 'Smartphone', 'Galaxy S 7', 'R39H30D7N1H', 'On Loan', '9/1/2016', '9/8/2016', NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (83, 'M2020A', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58G51CG9LT', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (84, 'M2020B', NULL, NULL, NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58G51CG9JW', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (85, 'Shark Bait', 'Gold - Money 2020', '5C:AD:CF:D0:56:17', NULL, 3, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPQM9DWG5VT', 'On Loan', '10/6/2016', '10/28/2016', NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (86, 'The Bern', NULL, '64:BC:0C:43:14:09', NULL, NULL, 1, 'LG', 'Smartphone', 'Nexus 5X', '00c643748a4d404c', 'Available', NULL, NULL, NULL, NULL, '4/20/2016', 27, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (87, 'Scooby', NULL, NULL, NULL, 10, 2, 'Sony', 'Camera', 'Bloggie Touch MHS-TS20', '1687101', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (88, 'George', NULL, NULL, NULL, 10, 2, 'Apple', 'Smartphone', 'iPhone 4S', 'C8PHLAMXDT9Y', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (89, 'John', NULL, NULL, NULL, 10, 2, 'Apple', 'Smartphone', 'iPhone 4S', 'C8PHLC24DT9Y', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (90, 'Paul', NULL, NULL, NULL, 10, 2, 'Apple', 'Smartphone', 'iPhone 4S', 'C8PHLC3SDT9Y', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (91, 'Katniss', NULL, NULL, NULL, 10, 2, 'Amazon', 'Kindle', 'Kindle Fire', 'FSN D01EA0A020852085218', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (92, 'Fred', NULL, NULL, NULL, 10, 2, 'Nokia', 'Smartphone', 'Lumia 800', 'x', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (93, 'Daphne', NULL, NULL, NULL, 10, 2, 'Panasonic', 'Camera', 'Lumix DMC-FH8', 'WP2CBB002027', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (94, 'Peeta', NULL, NULL, NULL, 10, 2, 'HTC', 'Smartphone', 'One', 'HT252W402718', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (95, 'Alvin', NULL, NULL, NULL, 10, 2, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152gc83353', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (96, 'Theodore', NULL, NULL, NULL, 10, 2, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152gc83354', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (97, 'Gale', NULL, NULL, NULL, 10, 2, 'Motorola', 'Smartphone', 'Razr XT-910', 'CHWG3237AB', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (98, 'Thing 1', NULL, NULL, NULL, 10, 2, 'SanDisk', 'Storage Device', 'SD Card', 'x', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (99, 'Thing 2', NULL, NULL, NULL, 10, 2, 'SanDisk', 'Storage Device', 'SD Card', 'x', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, '4/22/2016', 10, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (100, 'Big Bertha', 'OTP Phone', '00:37:6D:21:2E:DD', NULL, 14, 1, 'Samsung', 'Smartphone', 'Galaxy Note', 'R21C65AFTQW', 'Permanent', '7/26/2012', '5/6/2016', '7/26/2012', 14, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (101, 'Becky', NULL, '68:D9:3C:84:8A:12', NULL, NULL, 1, 'Apple', 'SmartTV', 'Apple TV', 'F6MNF1DJFF54', 'Available', NULL, NULL, '4/21/2015', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (102, 'Skolnick', NULL, '68:D9:3C:8D:FA:B2', NULL, NULL, 1, 'Apple', 'SmartTV', 'Apple TV', 'F6MNF1U9FF54', 'Available', NULL, NULL, '4/21/2015', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (103, 'Miner', NULL, '10:A5:D0:E2:B2:BB', NULL, 5, 1, 'Samsung', 'Smartphone', 'Galaxy S5', 'G900VVRU1ANCG', 'On Loan', '8/9/2016', '8/19/2016', '3/3/2015', 27, NULL, NULL, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (104, 'Abhijit', NULL, NULL, NULL, 1, 1, 'Samsung', 'Smartphone', 'Galaxy S7', 'R58H42DMZPW', 'Permanent', '5/9/2016', NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (105, 'Bob', 'Pending Inactive (PSP). 4/5/16', NULL, NULL, 17, 1, 'Apple', 'Tablet', 'iPad', 'DMPH9KGTDVGG', 'Permanent', '3/17/2012', '7/28/2016', '3/17/2012', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (106, 'Abigail', NULL, NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad 2', 'DMPG832HDFJ1', 'Missing', NULL, NULL, '3/17/2012', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (107, 'Greyson', NULL, NULL, NULL, 2, 1, 'Apple', 'Tablet', 'iPad Pro 1', 'DLXQR0SNGMLF', 'On Loan', '4/1/2016', '6/1/2016', '4/1/2016', 27, NULL, NULL, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (108, 'Kizzy', NULL, '5C:97:F3:4E:F1:12', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 5s', 'DX3NLA7NFNJJ', 'Available', NULL, NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (109, 'Uniamious', NULL, NULL, NULL, 1, 1, 'Apple', 'Smartphone', 'iPhone 6s', 'F18R4PF7GRYS', 'Permanent', '5/12/2016', NULL, '5/12/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (110, 'Powerthirst', NULL, NULL, NULL, NULL, 1, 'Apple', 'Computer', 'Macbook Pro', 'C02FR71LDF8V', 'Available', NULL, NULL, '8/6/2012', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (111, 'Kramer', NULL, NULL, NULL, 1, 1, 'Huawei', 'Smartphone', 'Nexus 6P', '84B7N16411005162', 'Permanent', '5/9/2016', NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (112, 'Mastercast', NULL, NULL, NULL, 25, 1, 'Symbol', 'Computer', 'TC70', '16047522503130', 'On Loan', '5/9/2016', NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (113, 'Anant', NULL, NULL, NULL, 1, 1, 'Apple', 'Watch', 'Watch', 'FH7RJ0T3GR7N', 'Permanent', '5/9/2016', NULL, '5/9/2016', 27, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (114, 'Walt', NULL, NULL, NULL, NULL, 1, 'Apple', 'SmartTV', 'Apple TV', 'C0HMPSA2FFS4', 'Available', NULL, NULL, '8/6/2014', 29, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (115, 'Pink', NULL, NULL, NULL, 2, 1, 'Apple', 'Tablet', 'iPad Air', 'DLXMYCM1FK10', 'On Loan', '11/2/2015', NULL, '8/6/2014', 29, NULL, NULL, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (116, 'Summer', 'Gold - Money 2020', '78:FD:94:7F:15:AB', NULL, 3, 1, 'Apple', 'Tablet', 'iPad Air', 'DLXMXK7CFK10', 'On Loan', '10/6/2016', '10/28/2016', '8/6/2014', 29, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (117, 'Patton', NULL, '50:F5:DA:0D:85:D5', NULL, 19, 1, 'Amazon', 'Speaker', 'Echo', '90F00718631205P5', 'Permanent ', NULL, NULL, '8/24/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (118, 'Eisenhower', NULL, '50:F5:DA:68:55:F4', NULL, 19, 1, 'Amazon ', 'Speaker', 'Echo', '90F007186312064M', 'Permanent', NULL, NULL, '8/24/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (119, 'Brick', NULL, '80:A5:89:7E:64:73', NULL, NULL, 1, 'Asus', 'Storage Device', 'Chromebit', 'FCMACX007717', 'Available', NULL, NULL, '9/1/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (120, 'Captain America', 'Retail Forum', '00:21:5C:F0:33:09', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC61700EM2', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (121, 'Iron Man', 'Retail Forum', '00:21:5C:EF:7252', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC61900DZ4', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (122, 'Hulk', 'Retail Forum', '00:21:5C:F0:54:D8', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC619006TJ', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (123, 'Thor', 'Retail Forum', '00:21:5C:EF:85:5D', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC61900DG2', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (124, 'Black Widow', 'Retail Forum', '00:21:5C:EF:9B:56', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC6190079T', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (125, 'Hawkeye', 'Retail Forum', '00:21:5C:EF:BD:D9', NULL, NULL, 1, 'Intel', 'Storage Device', 'Compute Stick', 'GESC6190064H', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (126, 'Bojack', NULL, NULL, NULL, 19, 1, 'Samsung', 'Smartphone', 'Galaxy S7 Edge', 'RF8H90SP7EN', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (127, 'Varys', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMPM5CFKFK14', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (128, 'Tormund', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMPM4F3QFK14', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (129, 'Brienne', NULL, NULL, NULL, 19, 1, 'Apple ', 'Tablet', 'iPad Air', 'DMPMKML6FK10', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (130, 'Obeyrn', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMPPNJ22FK10', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (131, 'Tywin', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad AIr', 'DMRM7FNAFK10', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (132, 'Jojen', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMRMRJN3FK10', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (133, 'Petyr', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air', 'DMVLXWXHFK14', 'Permanent', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (134, 'Hodor', NULL, '98:E0:D9:D1:63:11', NULL, NULL, 1, 'Apple ', 'Tablet', 'iPad Air', 'DMPPNQE6FK10', '???', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (135, 'Milli Vanilli', NULL, 'C0:F2:FB:85:D5:67', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Mini Gen 3', 'F4KN94WLG5V2', 'Available', NULL, NULL, '8/22/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (136, 'Apollo', NULL, '0C:D7;46:60:FE:68', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6S Plus', 'F2LQT5NGGRWF', '???', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (137, 'Hermes', NULL, '84:A1:34:56:B8:87', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6S Plus', 'F2LRR137GRWF', '???', NULL, NULL, '9/26/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (138, 'Hades', 'Retail Forum', 'C0:CC:F8:95:B8:C6', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6s Plus', 'C39R41XUGRWY', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (139, 'Finch', 'Retail Forum/SSID: NETGEAR80/Pass:silentfinch310', '10:DA:43:12:05:5D', NULL, NULL, 1, 'Netgear', 'Router', 'N750 Wireless Router', '3XB2665901661', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (140, 'Earth', 'Retail Forum/SSID: NETGEAR02/Pass:hungryearth555', '10:DA:43:12:05:75', NULL, NULL, 1, 'Netgear', 'Router', 'N750 Wireless Router', '3XB2665H01669', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (141, 'Plum', 'Retail Forum/SSID: NETGEAR18/Pass:festiveplum661', '10:DA::43:12:2A:EC', NULL, NULL, 1, 'Netgear', 'Router', 'N750 Wireless Router', '3XB2665N022E6', 'Permanent', NULL, NULL, '8/30/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (142, 'Frogger', NULL, '54:A0:50:96:50:D7', NULL, NULL, 1, 'Asus', 'Tablet', 'Nexus 7', '0b000a3a', 'Available', NULL, NULL, '8/22/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (143, 'Astroids', NULL, '54:A0:50:96:51:EF', NULL, NULL, 1, 'Asus ', 'Tablet', 'Nexus 7', '0a819e4b', 'Available', NULL, NULL, '8/22/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (144, 'Morty', NULL, NULL, NULL, 21, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58H716YJBZ', 'On Loan', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (145, 'Rick', NULL, '4C:66:41:5A:CB:BE', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58H716YJ0W', 'Available', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (146, 'Pearl Jam', 'Reserved: 9/26/16 - 9/28/16', '24:A0:74:4E:0A:F9', NULL, 8, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DLXNHY8KG5VV', 'Available', '9/16/2016', '9/28/2016', '8/22/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (147, 'Sansa', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60S2G5VJ', 'Permanent', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (148, 'Bran', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMQS5ALFG5VJ', 'Permanent', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (149, 'Jon', NULL, NULL, NULL, 19, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS609SG5VJ', 'Permanent', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (150, 'Melisandre', NULL, 'EC:AD:B8:66:A2:0C', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60BTG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (151, 'Sandor', NULL, 'EC:AD:B8:66:16:6E', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS603AG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (152, 'Samwell', NULL, 'EC:AD:B8:66:24:D5', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60UFG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (153, 'Arya', NULL, 'EC:AD:B8:65:33:4F', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMQS5V2CG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (154, 'PatchFace', NULL, 'EC:AD:B8:65:42:5B', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60X7G5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (155, 'Theon', NULL, 'EC:AD:B8:65:C3:D3', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS63ASG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (156, 'Daenerys', NULL, 'EC:AD:B8:65:4A:35', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS62XPG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (157, 'Cersei', NULL, 'EC:AD:B8:66:0C:E1', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60KXG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (158, 'Jaime', NULL, 'EC:AD:B8:65:4B:44', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS63F3G5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (159, 'Tyrion', NULL, NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS6022G5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (160, 'Bronn', NULL, 'EC:AD:B8:66:A0:1A', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS63CJG5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (161, 'Davos', NULL, 'EC:AD:B8:66:7F:35', NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', 'DMPS60U6G5VJ', '???', NULL, NULL, '8/17/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (162, 'Zeus', 'Retail Forum', '40:33:1A:DB:43:5E', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6s Plus', 'C39QD0EGGRWH', 'Permanent', NULL, NULL, '8/24/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (163, 'Poseidon', NULL, '40:33:1A:D4:99:41', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6s Plus', 'F2LQD0ZMGRWH', '???', NULL, NULL, '8/24/2016', 30, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (164, 'Calvin', NULL, '40:0E:85:14:A4:E0', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S4', '357086050754041', 'Available', NULL, NULL, '8/29/2013', 31, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (165, 'Connors', NULL, NULL, NULL, NULL, 1, 'Lenovo', 'Computer', 'IdeaPad S400 Touch', 'CB26929928', 'Available', NULL, NULL, '12/10/2013', 31, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (166, 'Nittany', NULL, NULL, NULL, 2, 1, 'Microsoft', 'Tablet', 'Surface RT', '24959630352', 'On Loan', '11/2/2015', NULL, '8/23/2013', 31, NULL, NULL, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (167, 'T1000', NULL, NULL, NULL, NULL, 1, 'Lenovo', 'Computer', 'ThinkPad S230u', '3347-2', 'Available', NULL, NULL, '12/10/2013', 31, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (168, 'Bacon', 'Stolen. SC Case #: 124021350', NULL, NULL, NULL, 1, 'Apple', 'Computer', 'MacBook Pro', 'C02J9A8EDV33', 'Removed', NULL, NULL, '1/16/2013', 32, NULL, NULL, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (169, 'Snow', NULL, NULL, NULL, 26, 1, 'Apple', 'Tablet', 'iPad', 'DMQHP1NXDVD1', 'On Loan', '7/11/2012', '6/30/2015', '7/11/2012', 33, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (170, 'Ringo', NULL, NULL, NULL, 10, 2, 'Apple', 'Tablet', 'iPad HD', 'DMPHR4ZQDVD1', 'Permanent', '8/16/2012', NULL, '8/16/2012', 33, NULL, NULL, '4/21/2016', NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (171, 'Joule', NULL, 'E4:CE:8F:21:6C:94', NULL, 7, 1, 'Apple', 'Computer', 'MacBook Pro', 'C02FR72LDF8V', 'Permanent', NULL, NULL, '8/14/2012', 33, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (172, 'Leia', NULL, NULL, NULL, 18, 3, 'AT&T Novatel Wireless', 'Mobile Hotspot', 'Mifi2372', 'NBZNRM-MIFI2372', 'Removed', NULL, NULL, '7/11/2012', 33, NULL, NULL, NULL, '4/5/2016', 18, 27); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (173, 'Curly', NULL, NULL, NULL, NULL, 1, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152GC8357', 'Available', NULL, NULL, '8/9/2012', 33, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (174, 'Moe', 'Stolen. SC Case #: 124021350', NULL, NULL, NULL, 1, 'IPEVO', 'Camera', 'Point 2 View USB Camera', '081152GC83360', 'Removed', NULL, NULL, '8/9/2012', 33, NULL, NULL, NULL, '12/5/2014', 35, 36); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (175, 'M2020C', 'White', NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Galaxy S6', NULL, 'Missing', NULL, NULL, '10/9/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (176, 'M2020D', 'White', NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Galaxy S6', NULL, 'Missing', NULL, NULL, '10/9/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (177, 'M2020E', 'Black SM-G920i - Money 2020', 'E8:50:8B:BD:AD:20', NULL, NULL, 1, 'Samsung', 'Smartphone', 'Galaxy S6', 'R58G50QZVDB', 'Available', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (178, '???', 'Black SM-G920i - Money 2020', NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Galaxy S6', NULL, 'Missing', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (179, 'Linkin Park', NULL, NULL, NULL, NULL, 1, 'Apple', 'Tablet', 'iPad Air Gen 2', NULL, 'DOA', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (180, '???', NULL, NULL, NULL, NULL, 5, 'Apple', 'Smartphone', 'iPhone 5', NULL, 'Missing', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (181, 'Krupa', NULL, 'C8:1E:E7:7E:08:1A', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6', 'F18PM3ZKG5MF', 'Available', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (182, 'Rich', NULL, '78:7E:61:46:62:FC', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6', 'F6WNH1SGG5MF', 'Available', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (183, 'Williams', NULL, 'D4:F4:6F:A0:DD:B0', NULL, NULL, 1, 'Apple', 'Smartphone', 'iPhone 6', 'DNPNDTRPG5MF', 'Available', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (184, '???', 'Gold - Money 2020', NULL, NULL, NULL, 5, 'Apple', 'Smartphone', 'iPhone 6', NULL, 'Missing', NULL, NULL, '8/19/2015', NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (185, 'Tommy (Green)', 'iOS App Challenge', 'AC:BC:32:8F:0C:BD', NULL, 4, 1, 'Apple', 'Computer', 'MacBook Pro Retina', 'C02Q90VMG8WN', 'Permanent', '9/19/2016', '1/1/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (186, 'Kimberly (Pink)', 'iOS App Challenge', 'AC:BC:32:87:3E:4F', NULL, 6, 1, 'Apple', 'Computer', 'MacBook Pro Retina', 'C02Q8C73G8WN', 'Permanent', '9/19/2016', '1/1/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (187, 'Jason (Red)', 'iOS App Challenge', 'AC:BC:32:8F:71:13', NULL, 22, 1, 'Apple', 'Computer', 'MacBook Pro Retina', 'C02Q90N2G8WN', 'Permanent', '9/19/2016', '1/1/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (188, 'Zack (Black)', 'iOS App Challenge', 'AC:BC:32:8E:B3:CB', NULL, 28, 1, 'Apple', 'Computer', 'MacBook Pro Retina', 'C02Q909WG8WN', 'Permanent', '9/19/2016', '1/1/2016', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (189, '???', NULL, NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Note 4', NULL, 'Missing', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (190, '???', NULL, NULL, NULL, NULL, 5, 'Samsung', 'Smartphone', 'Note 4', NULL, 'Missing', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (191, '???', NULL, NULL, NULL, NULL, 1, 'Cradlepoint', 'N/A', 'N/A', NULL, 'TBD', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `seniordesign`.`devices` (`Device_ID`, `Device_Name`, `Device_Description`, `MAC_Address`, `Ticket_ID`, `Renter`, `Location`, `Manufacturer`, `Hardware`, `Model`, `Serial_Num`, `Status`, `Borrow_Date`, `Return_Date`, `Creation_Date`, `Added_By`, `Last_Audit_Date`, `Audit_By`, `Audit_Email_Sent`, `Removal_Date`, `Removed_By`, `Removed_Approved_By`) VALUES (192, '???', NULL, NULL, NULL, NULL, 1, 'Cradlepoint', 'N/A', 'N/A', NULL, 'Broken', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); COMMIT; diff --git a/pom.xml b/pom.xml index c89420d..236c13e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,34 +1,34 @@ - - 4.0.0 - 2017-CSE-Senior-Project-Team-2 - 2017-CSE-Senior-Project-Team-2 - 0.0.1-SNAPSHOT - - src - - - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - maven-war-plugin - 3.0.0 - - WebContent - - - - - - - mysql - mysql-connector-java - 5.1.40 - - - war + + 4.0.0 + 2017-CSE-Senior-Project-Team-2 + 2017-CSE-Senior-Project-Team-2 + 0.0.1-SNAPSHOT + + src + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + maven-war-plugin + 3.0.0 + + WebContent + + + + + + + mysql + mysql-connector-java + 5.1.40 + + + war \ No newline at end of file diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java index 9911afc..2aeeb84 100644 --- a/src/database/MySQLAccess.java +++ b/src/database/MySQLAccess.java @@ -2,10 +2,14 @@ import java.sql.*; -public class MySQLAccess { - +import entities.ListedDevice; +import entities.RentedDevice; - public Statement connectDB() throws SQLException, ClassNotFoundException { +public class MySQLAccess { + + String[][] result = new String[20][3]; + + public void connectDB() throws SQLException, ClassNotFoundException { Class.forName("com.mysql.jdbc.Driver"); Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); Statement statement = connect.createStatement(); @@ -13,4 +17,58 @@ public Statement connectDB() throws SQLException, ClassNotFoundException { return statement; } + + public RentedDevice[] getUserDevices(String userID) throws SQLException, ClassNotFoundException{ + //Not sure how to get cookie information (if that is how we choose to accomplish this...) ? But this should be a passed parameter + System.getenv("VCAP_SERVICES"); + Class.forName("com.mysql.jdbc.Driver"); + Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); + Statement stmt = connect.createStatement(); + ResultSet resultSet = stmt.executeQuery("SELECT Device_ID, Device_Name, Device_Description, Ticket_ID, Hardware, Model, Borrow_Date FROM devices WHERE Renter = " + userID); + int counter = 0; + + resultSet.last(); + int rows = resultSet.getRow(); + resultSet.beforeFirst(); + + //Covers amount of rows, and 6 attributes (indices 0-5) + RentedDevice[] devices = new RentedDevice[rows]; + + //iterate result set + while(resultSet.next()){ + devices[counter] = new RentedDevice(resultSet.getInt("Device_ID") + "",resultSet.getString("Device_Name"),resultSet.getString("Device_Description"),resultSet.getInt("Ticket_ID") + "",resultSet.getString("Hardware"),resultSet.getString("Model"),resultSet.getString("Borrow_Date")); + counter++; + } + + return devices; + } + + public ListedDevice[] getAllDevices() throws SQLException, ClassNotFoundException{ + //Not sure how to get cookie information (if that is how we choose to accomplish this...) ? But this should be a passed parameter + System.getenv("VCAP_SERVICES"); + Class.forName("com.mysql.jdbc.Driver"); + Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317"); + Statement stmt = connect.createStatement(); + ResultSet resultSet = stmt.executeQuery("SELECT * FROM devices"); + int counter = 0; + + resultSet.last(); + int rows = resultSet.getRow(); + resultSet.beforeFirst(); + + //Covers amount of rows, and 6 attributes (indices 0-5) + ListedDevice[] devices = new ListedDevice[rows]; + + //iterate result set + while(resultSet.next()){ + devices[counter] = new ListedDevice(resultSet.getString("Device_Name"),resultSet.getString("Device_Description"),resultSet.getString("Hardware"),resultSet.getString("Model")); + counter++; + } + + return devices; + } + + public String[][] getResult(){ + return result; + } } diff --git a/src/entities/Admin.java b/src/entities/Admin.java deleted file mode 100644 index f5d12c5..0000000 --- a/src/entities/Admin.java +++ /dev/null @@ -1,13 +0,0 @@ -package entities; -/** - * Admins get special privileges! - * @author conno - * - */ -public class Admin extends User { - - public Admin(int id, int location, String name) { - super(id, location, name); - } - -} diff --git a/src/entities/Device.java b/src/entities/Device.java deleted file mode 100644 index 197ed6c..0000000 --- a/src/entities/Device.java +++ /dev/null @@ -1,45 +0,0 @@ -package entities; - - -/** - * This illustrates a device that will be requested. - * Later will be replaced by database entity. - * @author conno - * - */ -public class Device { -private int id; -private String type; -private String version; -private boolean available; - -/** - * Constructor. - * @param id - * @param type - * @param version - */ - public Device(int id, String type, String version){ - this.id = id; - this.type = type; - this.version = version; - this.available = true; - } - - public String getType(){ - return this.type; - } - - public String getVersion(){ - return this.version; - } - - public boolean checkAvailabilty(){ - return this.available; - } - - public void setAvailability(){ - this.available = !available; - } - -} diff --git a/src/entities/ListedDevice.java b/src/entities/ListedDevice.java new file mode 100644 index 0000000..77877dc --- /dev/null +++ b/src/entities/ListedDevice.java @@ -0,0 +1,50 @@ +package entities; +/** + * Simple Modification of the RentedDevice class for use in the listed devices page. + * @author John Costa III + * + */ +public class ListedDevice { + private String Device_Name; + private String Device_Description; + private String Hardware; + private String Model; + public ListedDevice(String name, String desc, String hardware, String model) { + Device_Name = name; + Device_Description = desc; + Hardware = hardware; + Model = model; + } + /** + * Formatting the device to fit a JSON object. + * @author - Connor + */ + public String toString(){ + StringBuilder sb = new StringBuilder(); + String comma = ", "; + sb.append("{\"name\": \"").append(Device_Name).append("\"").append(comma); + sb.append("\"description\": \"").append(Device_Description).append("\"").append(comma); + sb.append("\"hardware\": \"").append(Hardware).append("\"").append(comma); + sb.append("\"model\": \"").append(Model).append("\""); + sb.append("}"); + return sb.toString(); + } + /** + * This is a static function which will turn a Listed Device array into its proper string. (modification) + * @author - Connor + * @param array + * @return + */ + public static String arrayToString(ListedDevice[] array){ + StringBuilder sb = new StringBuilder(); + sb.append("["); + for(int i = 0; i < array.length; i++){ + sb.append(array[i].toString()); + if(i+1 != array.length){ + sb.append(","); + } + } + sb.append("]"); + return sb.toString(); + } +} diff --git a/src/entities/RentedDevice.java b/src/entities/RentedDevice.java new file mode 100644 index 0000000..2382fd7 --- /dev/null +++ b/src/entities/RentedDevice.java @@ -0,0 +1,86 @@ +package entities; + +/** + * Will support querying devices a certain user has rented out. + * @author conno + * + */ +public class RentedDevice { + private String Device_ID; + private String Device_Name; + private String Device_Description; + private String Ticket_ID; + //Smartphone, tablet, etc. + private String Hardware; + //iPhone, Galaxy S5, etc. + private String Model; + private String Borrow_Date; + + public RentedDevice(String id, String name, String desc, String ticketid, String hardware, String model, String date){ + Device_ID = id; + Device_Name = name; + Device_Description = desc; + Ticket_ID = ticketid; + Hardware = hardware; + Model = model; + Borrow_Date = date; + } +/** + * Formatting the device to fit a JSON object. + */ + public String toString(){ + StringBuilder sb = new StringBuilder(); + String comma = ", "; + sb.append("{\"id\": ").append(Device_ID).append(comma); + sb.append("\"name\": \"").append(Device_Name).append("\"").append(comma); + sb.append("\"description\": \"").append(Device_Description).append("\"").append(comma); + sb.append("\"ticket\": \"").append(Ticket_ID).append("\"").append(comma); + sb.append("\"hardware\": \"").append(Hardware).append("\"").append(comma); + sb.append("\"model\": \"").append(Model).append("\"").append(comma); + sb.append("\"checkout\": \"").append(Borrow_Date).append("\""); + sb.append("}"); + return sb.toString(); + } + + /** + * This is a static function which will turn a Rented Device array into its proper string. + * @param array + * @return + */ + public static String arrayToString(RentedDevice[] array){ + StringBuilder sb = new StringBuilder(); + sb.append("["); + for(int i = 0; i < array.length; i++){ + sb.append(array[i].toString()); + if(i+1 != array.length){ + sb.append(","); + } + } + sb.append("]"); + return sb.toString(); + } + + public String getID(){ + return Device_ID; + } + + public String getName(){ + return Device_Name; + } + + public String getDesc(){ + return Device_Description; + } + + public String getTicketID(){ + return Ticket_ID; + } + + public String getModel(){ + return Model; + } + + public String getHardware(){ + return Hardware; + } +} \ No newline at end of file diff --git a/src/entities/User.java b/src/entities/User.java deleted file mode 100644 index 8d7e49c..0000000 --- a/src/entities/User.java +++ /dev/null @@ -1,13 +0,0 @@ -package entities; - -public class User { -private int id; -private int location; -private String name; - - public User(int id, int location, String name){ - this.id = id; - this.location = location; - this.name = name; //later will do table lookup to determine by id - } -} diff --git a/src/features/RequestHandler.java b/src/features/RequestHandler.java deleted file mode 100644 index 590bab1..0000000 --- a/src/features/RequestHandler.java +++ /dev/null @@ -1,90 +0,0 @@ -package features; - -import java.util.ArrayList; -import java.util.Scanner; - -import entities.Device; - -public class RequestHandler { - - public void requestDevice(Scanner STDIN, Device[] db){ - System.out.println("What type of device would you like to request?\n"); - ArrayList listtypes = displayTypes(db); //displays types that can be chosen from - System.out.print("\nChoice: "); - String type = STDIN.nextLine().toLowerCase(); //gets user input of what they want - System.out.print("---------------------------------------------------------------------------------------------------------\n"); - if(type.equals("cancel") || type.equals(Integer.toString(listtypes.size() + 1))) //if user wants to cancel - return; - while(!checkAvailability(type,db)){ //makes sure the user typed in a valid option - System.out.print("Please choose a valid type.\nChoice: "); - type = STDIN.nextLine().toLowerCase(); - if(type.equals("cancel") || type.equals(Integer.toString(listtypes.size()))) //if user wants to cancel - return; - } - System.out.print("Type which number device you would like!\n\n"); - int cancelindex = displayDevices(type,db); - System.out.print("\nChoice: "); - String input = STDIN.nextLine(); - System.out.print("---------------------------------------------------------------------------------------------------------\n"); - if(input.toLowerCase().equals("cancel") || input.equals(Integer.toString(cancelindex))) - return; - int option = Integer.parseInt(input); - while(option > cancelindex || option < 1){ - System.out.print("Invalid option, please choose a right one.\nChoice: "); - if(input.toLowerCase().equals("cancel") || input.equals(Integer.toString(cancelindex))) - return; - option = Integer.parseInt(STDIN.nextLine()); - System.out.print("---------------------------------------------------------------------------------------------------------\n"); - } - checkoutDevice(option, type, db); - System.out.print("---------------------------------------------------------------------------------------------------------\n"); - } - - public boolean checkAvailability(String type, Device[] db){ - for(int i = 0; i < db.length; i++){ - if(db[i].getType().toLowerCase().equals(type) == true && db[i].checkAvailabilty() == true) - return true; - } - return false; - } - - public int displayDevices(String type, Device[] db){ - int counter = 1; - for(int i = 0; i < db.length; i++){ - if(db[i].getType().toLowerCase().equals(type) == true && db[i].checkAvailabilty() == true){ - System.out.print(counter + ": " + db[i].getType() + " - " + db[i].getVersion() + "\n"); - counter++; - } - } - System.out.print(counter + ". Cancel\n"); - return counter; - } - - public void checkoutDevice(int option, String type, Device[] db){ - int counter = 1; - for(int i = 0; i < db.length; i++){ - if(db[i].getType().toLowerCase().equals(type) == true && db[i].checkAvailabilty() == true){ - if(counter == option){ - db[i].setAvailability(); - } - counter++; - } - } - System.out.print("Congrats! You checked out the device.\n"); - } - - public ArrayList displayTypes(Device[] db){ - ArrayList al = new ArrayList(); - int counter = 1; - for(int i = 0; i < db.length; i++){ - if(!al.contains(db[i].getType()) && db[i].checkAvailabilty() == true){ - al.add(db[i].getType()); - System.out.print(counter + ". " + db[i].getType() + "\n"); - counter++; - } - } - System.out.println(counter + ". Cancel\n"); - return al; - } - -} diff --git a/src/features/ReturnHandler.java b/src/features/ReturnHandler.java deleted file mode 100644 index 4d73b34..0000000 --- a/src/features/ReturnHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -package features; - -import entities.Device; - -public class ReturnHandler -{ - public void returnDevice() - { - // Insert some sort of user verification into this system - String user = "Maegan"; - System.out.print("Welcome " + user + "which device would you like to return"); - //Hard code devices in? - } - - public boolean changeAvailability(String type, Device[] db) - { - return true; - - } - - - -} diff --git a/src/functionality_managers/ClientManager.java b/src/functionality_managers/ClientManager.java deleted file mode 100644 index e0e0d8a..0000000 --- a/src/functionality_managers/ClientManager.java +++ /dev/null @@ -1,20 +0,0 @@ -package functionality_managers; - -import java.util.Scanner; - -import entities.Device; -import features.RequestHandler; - -/** - * This class will effectively manage any type of task a client would like to do. - * @author conno - * - */ -public class ClientManager { - - private RequestHandler rh = new RequestHandler(); - - public void requestDevice(Scanner STDIN, Device[] db){ - rh.requestDevice(STDIN, db); - } -} diff --git a/src/functionality_managers/SystemManager.java b/src/functionality_managers/SystemManager.java deleted file mode 100644 index c5bc8c3..0000000 --- a/src/functionality_managers/SystemManager.java +++ /dev/null @@ -1,69 +0,0 @@ -package functionality_managers; - -import java.util.Scanner; - -import entities.Device; - -/** - * This will manage tasks that have to generally be handled by the system. - * @author conno - * - */ -public class SystemManager { - - private Device[] db; - - public SystemManager(){ - Device dev1 = new Device(0, "iPod", "iOS7"); - Device dev2 = new Device(0, "iPod", "iOS8"); - Device dev3 = new Device(0, "iPad", "iOS10"); - Device dev4 = new Device(0, "iPhone", "iOS9"); - Device dev5 = new Device(0, "iPhone", "iOS7"); - - db = new Device[] {dev1, dev2, dev3, dev4, dev5}; - } - - /** - * This will (later) return a user object based on who is logging in. - * @param STDIN - */ - public void loginProcess(Scanner STDIN){ - /* - * Based on the user name we can create a user object - * Make the return type a user - * Use the user return so that the return handler remembers a client - */ - System.out.print("---------------------------------------------------------------------------------------------------------\n"); - System.out.print("Welcome to the Senior Design Request System!\nPlease type in your login credentials below.\nUser: "); - String name = STDIN.nextLine(); - System.out.print("Password: "); - String pass = STDIN.nextLine(); - //will obviously later have a more clear cut way of login - System.out.print("\nLog in successful!\n"); - System.out.print("---------------------------------------------------------------------------------------------------------\n"); - //return user - } - - public void runMenu(Scanner STDIN, ClientManager cm){ - while(true){ - System.out.println("Welcome to the request system! Please select a menu option from below of what you'd like to do:\n\n1. Request Device\n2. Quit\n\nChoice: "); - String option = STDIN.nextLine(); - System.out.print("---------------------------------------------------------------------------------------------------------\n"); - switch(option.toLowerCase()){ - case "request device": - cm.requestDevice(STDIN, db); - break; - case "quit": - System.out.print("Thanks for using the service.\n\n"); - return; - case "1": - cm.requestDevice(STDIN, db); - break; - case "2": - System.out.print("Thanks for using the service.\n\n"); - return; - } - } - } - -} diff --git a/src/main/Main.java b/src/main/Main.java index 691ab9a..f6f1cfa 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -2,9 +2,6 @@ import java.util.Scanner; -import functionality_managers.ClientManager; -import functionality_managers.SystemManager; - public class Main { public static void main(String[] args) {