diff --git a/documentation/diagrams/SDP_MobileUI.pptx b/WebContent/html/frameworks/Mobile UI Frameworks.pptx similarity index 100% rename from documentation/diagrams/SDP_MobileUI.pptx rename to WebContent/html/frameworks/Mobile UI Frameworks.pptx diff --git a/db/ER Diagram.png b/db/ER Diagram.png new file mode 100644 index 0000000..07760c1 Binary files /dev/null and b/db/ER Diagram.png differ diff --git a/db/Schema.mwb b/db/Schema.mwb new file mode 100644 index 0000000..84dcc20 Binary files /dev/null and b/db/Schema.mwb differ diff --git a/db/Workbench Schema.mwb b/db/Workbench Schema.mwb deleted file mode 100644 index 03d6ed6..0000000 Binary files a/db/Workbench Schema.mwb and /dev/null differ diff --git a/db/Workbench Schema.mwb.bak b/db/Workbench Schema.mwb.bak deleted file mode 100644 index 25df763..0000000 Binary files a/db/Workbench Schema.mwb.bak and /dev/null differ diff --git a/db/er.png b/db/er.png deleted file mode 100644 index e7adce0..0000000 Binary files a/db/er.png and /dev/null differ diff --git a/db/seniordesign.mwb b/db/seniordesign.mwb deleted file mode 100644 index 3106b1c..0000000 Binary files a/db/seniordesign.mwb and /dev/null differ diff --git a/db/seniordesign.sql b/db/seniordesign.sql deleted file mode 100644 index 2e28052..0000000 --- a/db/seniordesign.sql +++ /dev/null @@ -1,224 +0,0 @@ --- MySQL Script generated by MySQL Workbench --- 12/03/16 22:12:11 --- Model: New Model Version: 1.0 --- MySQL Workbench Forward Engineering - -SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; -SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; -SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES'; - --- ----------------------------------------------------- --- Schema seniordesign --- ----------------------------------------------------- - --- ----------------------------------------------------- --- Schema seniordesign --- ----------------------------------------------------- -CREATE SCHEMA IF NOT EXISTS `seniordesign` DEFAULT CHARACTER SET utf8 ; -USE `seniordesign` ; - --- ----------------------------------------------------- --- Table `seniordesign`.`location` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `seniordesign`.`location` ( - `Location_ID` INT(11) NOT NULL COMMENT 'Identification key for a location.', - `Name` VARCHAR(45) NOT NULL COMMENT 'Name of the location, not necessarily unique.', - `Address` VARCHAR(45) NOT NULL COMMENT 'Address for shipping.', - `Zip_Code` INT(11) NOT NULL COMMENT 'Zip Code for shipping', - PRIMARY KEY (`Location_ID`)) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - - --- ----------------------------------------------------- --- Table `seniordesign`.`employee` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `seniordesign`.`employee` ( - `Employee_ID` INT(11) NOT NULL COMMENT 'Employee ID number.', - `Location_ID` INT(11) NOT NULL COMMENT 'Where the employee is registered to work at.', - `Name` VARCHAR(45) NOT NULL COMMENT 'Actual name, might not be unique', - PRIMARY KEY (`Employee_ID`), - INDEX `LOCATION_ID_idx` (`Location_ID` ASC), - CONSTRAINT `Employee_Location_ID` - FOREIGN KEY (`Location_ID`) - REFERENCES `seniordesign`.`location` (`Location_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - - --- ----------------------------------------------------- --- Table `seniordesign`.`fingerprint` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `seniordesign`.`fingerprint` ( - `Finger_ID` INT(11) NOT NULL, - `Finger_Data` INT(11) NOT NULL, - PRIMARY KEY (`Finger_ID`)) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - - --- ----------------------------------------------------- --- Table `seniordesign`.`admin` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `seniordesign`.`admin` ( - `Admin_ID` INT(11) NOT NULL, - `Finger_ID` INT(11) NULL DEFAULT NULL, - `Finger_Registered_Flag` INT(11) NULL DEFAULT NULL, - `Employee_ID` INT(11) NULL DEFAULT NULL, - PRIMARY KEY (`Admin_ID`), - INDEX `EMPLOYEE_ID_idx` (`Employee_ID` ASC), - INDEX `Finger_ID_idx` (`Finger_ID` ASC), - CONSTRAINT `Admin_Employee_ID` - FOREIGN KEY (`Employee_ID`) - REFERENCES `seniordesign`.`employee` (`Employee_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION, - CONSTRAINT `Admin_Finger_ID` - FOREIGN KEY (`Finger_ID`) - REFERENCES `seniordesign`.`fingerprint` (`Finger_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - - --- ----------------------------------------------------- --- Table `seniordesign`.`ticket` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `seniordesign`.`ticket` ( - `Ticket_ID` INT(11) NOT NULL COMMENT 'Identification piece of a ticket.', - `Requestor` INT(11) NOT NULL COMMENT 'Whoever initiated the request. Will use their employee ID.', - `Item_Amt` INT(11) NOT NULL COMMENT 'However many items are on a request. Must be at least 1.', - `Begin_Date` DATE NOT NULL COMMENT 'The date that the request was initiated.', - PRIMARY KEY (`Ticket_ID`), - INDEX `Requestor_idx` (`Requestor` ASC), - CONSTRAINT `Ticket_Requestor` - FOREIGN KEY (`Requestor`) - REFERENCES `seniordesign`.`employee` (`Employee_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - - --- ----------------------------------------------------- --- Table `seniordesign`.`devices` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `seniordesign`.`devices` ( - `Device_ID` INT(11) NOT NULL COMMENT 'How devices will be individually identified. ', - `Device_Name` VARCHAR(45) NOT NULL, - `Device_Description` VARCHAR(200) NOT NULL, - `Ticket_ID` INT(11) NULL DEFAULT NULL COMMENT 'The ticket this device is currently ordered on. Can be null if not ordered out. Foreign key to the ticket table’s primary key.', - `Renter` INT(11) NULL DEFAULT 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.', - `Manufacturer` VARCHAR(45) NOT NULL, - `Hardware_Type` VARCHAR(45) NOT NULL COMMENT 'What brand of device it is, such as iPad, iPhone, etc.', - `Model` VARCHAR(45) NOT NULL, - `Serial_Num` VARCHAR(45) NOT NULL, - `Available` INT(11) NOT NULL COMMENT 'Describes if the device is available to rent out yet or not.', - `Return_Date` DATE NULL DEFAULT NULL COMMENT 'Describes how much time is left from the requested amount of time – will cooperate with sending automatic reminders about returning the device. Can be null if the device isn’t rented out.', - `NFC_ID` INT(11) NULL DEFAULT NULL, - PRIMARY KEY (`Device_ID`), - INDEX `Device_Renter_idx` (`Renter` ASC), - INDEX `Device_Location_idx` (`Location` ASC), - INDEX `Device_Ticket_ID_idx` (`Ticket_ID` ASC), - INDEX `Device_Item_Num_idx` (`Ticket_ID` ASC), - CONSTRAINT `Device_Location` - FOREIGN KEY (`Location`) - REFERENCES `seniordesign`.`location` (`Location_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION, - CONSTRAINT `Device_Renter` - FOREIGN KEY (`Renter`) - REFERENCES `seniordesign`.`employee` (`Employee_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION, - CONSTRAINT `Device_Ticket_ID` - FOREIGN KEY (`Ticket_ID`) - REFERENCES `seniordesign`.`ticket` (`Ticket_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - - --- ----------------------------------------------------- --- Table `seniordesign`.`item` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `seniordesign`.`item` ( - `Ticket_ID` INT(11) NOT NULL COMMENT 'The ticket this item is on. This will be both part of the composite key and a foreign key.', - `Item_Num` INT(11) NOT NULL COMMENT 'This is the index the item has on the ticket. This is part of the composite key and the foreign key.', - `Renter` INT(11) NOT NULL COMMENT 'Employee ID of whoever is responsible for this item.', - `Location` INT(11) NOT NULL COMMENT 'Employee ID of whoever is responsible for this item.', - `Device_ID` INT(11) NULL DEFAULT NULL COMMENT 'The ID of the device that is associated to this item. This is null until the administrator assigns a device to an item.', - `Status` VARCHAR(45) NOT NULL COMMENT 'Whatever the current status is of the item.', - `Status_Date_Fields_(Start&End)` DATE NULL DEFAULT NULL COMMENT 'We will include fields for all the start/end times of a status. We haven’t determined all the statuses yet. It is null if that status hasn’t been reached yet.', - `Request_Date` DATE NOT NULL COMMENT 'Includes the date that the device might be able to be returned by. Will incorporate into the automated email notification system.', - PRIMARY KEY (`Ticket_ID`, `Item_Num`), - INDEX `Item_Renter_idx` (`Renter` ASC), - INDEX `Item_Location_idx` (`Location` ASC), - INDEX `Item_Device_ID_idx` (`Device_ID` ASC), - CONSTRAINT `Item_Device_ID` - FOREIGN KEY (`Device_ID`) - REFERENCES `seniordesign`.`devices` (`Device_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION, - CONSTRAINT `Item_Location` - FOREIGN KEY (`Location`) - REFERENCES `seniordesign`.`location` (`Location_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION, - CONSTRAINT `Item_Renter` - FOREIGN KEY (`Renter`) - REFERENCES `seniordesign`.`employee` (`Employee_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION, - CONSTRAINT `Item_Ticket_ID` - FOREIGN KEY (`Ticket_ID`) - REFERENCES `seniordesign`.`ticket` (`Ticket_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - - --- ----------------------------------------------------- --- Table `seniordesign`.`sadmin` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `seniordesign`.`sadmin` ( - `Sadmin_ID` INT(11) NOT NULL, - `Password` VARCHAR(45) NULL DEFAULT NULL, - `Employee_ID` INT(11) NULL DEFAULT NULL, - PRIMARY KEY (`Sadmin_ID`), - INDEX `EMPLOYEE_ID_idx` (`Employee_ID` ASC), - CONSTRAINT `Sadmin_Employee_ID` - FOREIGN KEY (`Employee_ID`) - REFERENCES `seniordesign`.`employee` (`Employee_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - - --- ----------------------------------------------------- --- Table `seniordesign`.`waitlist` --- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `seniordesign`.`waitlist` ( - `Waitlist_ID` INT(11) NOT NULL, - `Ticket_ID` INT(11) NOT NULL, - PRIMARY KEY (`Waitlist_ID`), - INDEX `TICKET_ID_idx` (`Ticket_ID` ASC), - CONSTRAINT `Waitlist_Ticket_ID` - FOREIGN KEY (`Ticket_ID`) - REFERENCES `seniordesign`.`ticket` (`Ticket_ID`) - ON DELETE NO ACTION - ON UPDATE NO ACTION) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - - -SET SQL_MODE=@OLD_SQL_MODE; -SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; -SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; diff --git a/documentation/diagrams/ER Diagram.png b/documentation/diagrams/ER Diagram.png index 7805694..07760c1 100644 Binary files a/documentation/diagrams/ER Diagram.png and b/documentation/diagrams/ER Diagram.png differ diff --git a/documentation/diagrams/Process Flow Basic.png b/documentation/diagrams/Process Flow Basic.png new file mode 100644 index 0000000..20ca574 Binary files /dev/null and b/documentation/diagrams/Process Flow Basic.png differ diff --git a/documentation/diagrams/SDP16_ProcessFlow.vsdx b/documentation/diagrams/Process Flow.vsdx similarity index 76% rename from documentation/diagrams/SDP16_ProcessFlow.vsdx rename to documentation/diagrams/Process Flow.vsdx index 44d5e88..300f708 100644 Binary files a/documentation/diagrams/SDP16_ProcessFlow.vsdx and b/documentation/diagrams/Process Flow.vsdx differ diff --git a/documentation/diagrams/SDP16_ProcessFlow.png b/documentation/diagrams/SDP16_ProcessFlow.png deleted file mode 100644 index d8e4141..0000000 Binary files a/documentation/diagrams/SDP16_ProcessFlow.png and /dev/null differ diff --git a/documentation/papers/ProjectDesignSpec.docx b/documentation/papers/ProjectDesignSpec_Draft.docx similarity index 100% rename from documentation/papers/ProjectDesignSpec.docx rename to documentation/papers/ProjectDesignSpec_Draft.docx diff --git a/documentation/papers/ProjectRequirementSpecs.docx b/documentation/papers/ProjectRequirementSpecs.docx deleted file mode 100644 index fd498a9..0000000 Binary files a/documentation/papers/ProjectRequirementSpecs.docx and /dev/null differ diff --git a/documentation/papers/~$ojectRequirementSpecs.docx b/documentation/papers/~$ojectRequirementSpecs.docx deleted file mode 100644 index 3318010..0000000 Binary files a/documentation/papers/~$ojectRequirementSpecs.docx and /dev/null differ diff --git a/documentation/presentations/Fall Presentation.pptx b/documentation/presentations/Fall Presentation.pptx new file mode 100644 index 0000000..cae7f37 Binary files /dev/null and b/documentation/presentations/Fall Presentation.pptx differ