diff --git a/sql/01-pg_create_tables.sql b/sql/01-pg_create_tables.sql index d03ca1c..14b19ff 100644 --- a/sql/01-pg_create_tables.sql +++ b/sql/01-pg_create_tables.sql @@ -43,20 +43,23 @@ INCREMENT BY 1; CREATE TABLE ie_batch ( b_id INT4 PRIMARY KEY, - b_name VARCHAR(5000) UNIQUE + b_name VARCHAR(5000) UNIQUE, + b_is_active BOOLEAN NOT NULL ); CREATE TABLE ie_eval_type ( et_id INT4 PRIMARY KEY, - et_description VARCHAR(5000) NOT NULL + et_description VARCHAR(5000) NOT NULL, + et_is_active BOOLEAN NOT NULL ); CREATE TABLE ie_person_role ( pr_id INT4 PRIMARY KEY, - pr_title VARCHAR(5000) NOT NULL + pr_title VARCHAR(5000) NOT NULL, + pr_is_active BOOLEAN NOT NULL ); CREATE TABLE ie_person @@ -64,7 +67,8 @@ CREATE TABLE ie_person p_id INT4 PRIMARY KEY, p_firstname VARCHAR(5000) NOT NULL, p_lastname VARCHAR(5000) NOT NULL, - p_role INT4 NOT NULL, FOREIGN KEY(p_role) REFERENCES ie_person_role(pr_id) ON DELETE CASCADE + p_role INT4 NOT NULL, FOREIGN KEY(p_role) REFERENCES ie_person_role(pr_id) ON DELETE CASCADE, + p_is_active BOOLEAN NOT NULL ); CREATE TABLE ie_eval @@ -74,14 +78,16 @@ CREATE TABLE ie_eval e_date DATE NOT NULL, e_eval_type INT4 NOT NULL,FOREIGN KEY(e_eval_type) REFERENCES ie_eval_type(et_id) ON DELETE CASCADE, e_pid_trainee INT4 NOT NULL, FOREIGN KEY(e_pid_trainee) REFERENCES ie_person(p_id) ON DELETE CASCADE, - e_batch INT4 NOT NULL, FOREIGN KEY(e_batch) REFERENCES ie_batch(b_id) ON DELETE CASCADE + e_batch INT4 NOT NULL, FOREIGN KEY(e_batch) REFERENCES ie_batch(b_id) ON DELETE CASCADE, + e_is_active BOOLEAN NOT NULL ); CREATE TABLE ie_eval_comment ( ec_id INT4 PRIMARY KEY, ec_text VARCHAR(5000) NOT NULL, - ec_eid INT4 NOT NULL, FOREIGN KEY(ec_eid) REFERENCES ie_eval(e_id) ON DELETE CASCADE + ec_eid INT4 NOT NULL, FOREIGN KEY(ec_eid) REFERENCES ie_eval(e_id) ON DELETE CASCADE, + ec_is_active BOOLEAN NOT NULL ); CREATE TABLE ie_person_batch @@ -94,7 +100,8 @@ CREATE TABLE ie_person_batch CREATE TABLE ie_subject ( s_id INT4 PRIMARY KEY, - s_subject VARCHAR(150) NOT NULL + s_subject VARCHAR(150) NOT NULL, + s_is_active BOOLEAN NOT NULL ); CREATE TABLE ie_question_pool @@ -105,7 +112,8 @@ CREATE TABLE ie_question_pool qp_max_knowledge_score INT4 NOT NULL, qp_sid INT4 NOT NULL, FOREIGN KEY(qp_sid) REFERENCES ie_subject(s_id) ON DELETE CASCADE, qp_count INT4 DEFAULT 0 NOT NULL, - qp_last_date_used DATE + qp_last_date_used DATE, + qp_is_active BOOLEAN NOT NULL ); CREATE TABLE ie_question_eval @@ -114,12 +122,14 @@ CREATE TABLE ie_question_eval qe_communication_score INT4 NOT NULL, qe_knowledge_score INT4 NOT NULL, qe_eid INT4 NOT NULL, FOREIGN KEY(qe_eid) REFERENCES ie_eval(e_id) ON DELETE CASCADE, - qe_qpid INT4 NOT NULL, FOREIGN KEY(qe_qpid) REFERENCES ie_question_pool(qp_id) ON DELETE CASCADE + qe_qpid INT4 NOT NULL, FOREIGN KEY(qe_qpid) REFERENCES ie_question_pool(qp_id) ON DELETE CASCADE, + qe_is_active BOOLEAN NOT NULL ); CREATE TABLE ie_question_comment ( qc_id INT4 PRIMARY KEY, qc_comment_text VARCHAR(5000) NOT NULL, - qc_eid INT4 NOT NULL, FOREIGN KEY(qc_eid) REFERENCES ie_question_eval(qe_id) ON DELETE CASCADE + qc_eid INT4 NOT NULL, FOREIGN KEY(qc_eid) REFERENCES ie_question_eval(qe_id) ON DELETE CASCADE, + qc_is_active BOOLEAN NOT NULL ); diff --git a/sql/02-pg_fill_tables.sql b/sql/02-pg_fill_tables.sql index db0c294..a1bf38c 100644 --- a/sql/02-pg_fill_tables.sql +++ b/sql/02-pg_fill_tables.sql @@ -1,93 +1,94 @@ -- Fill Tables -- ie_person_role -INSERT INTO ie_person_role (pr_id, pr_title) VALUES (1, 'trainee'); -INSERT INTO ie_person_role (pr_id, pr_title) VALUES (2, 'trainer'); -INSERT INTO ie_person_role (pr_id, pr_title) VALUES (3, 'qc'); +INSERT INTO ie_person_role (pr_id, pr_title,pr_is_active) VALUES (1, 'trainee',true); +INSERT INTO ie_person_role (pr_id, pr_title,pr_is_active) VALUES (2, 'trainer',true); +INSERT INTO ie_person_role (pr_id, pr_title,pr_is_active) VALUES (3, 'qc',true); -- ie_eval_type -INSERT INTO ie_eval_type (et_id, et_description) VALUES (1, 'Trainer'); -INSERT INTO ie_eval_type (et_id, et_description) VALUES (2, 'QC'); +INSERT INTO ie_eval_type (et_id, et_description,et_is_active) VALUES (1, 'Trainer',true); +INSERT INTO ie_eval_type (et_id, et_description,et_is_active) VALUES (2, 'QC',true); -- ie_subject -INSERT INTO ie_subject (s_id, s_subject) VALUES (1, 'Core Java'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (2, 'Spring'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (3, 'SQL'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (4, 'JavaScript'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (5, 'Hibernate'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (6, 'DevOps'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (7, 'AWS'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (8, 'Angular'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (9, 'SOAP'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (10, 'REST'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (11, 'HTML'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (12, 'CSS'); -INSERT INTO ie_subject (s_id, s_subject) VALUES (13, 'Servlets'); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (1, 'Core Java',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (2, 'Spring',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (3, 'SQL',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (4, 'JavaScript',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (5, 'Hibernate',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (6, 'DevOps',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (7, 'AWS',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (8, 'Angular',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (9, 'SOAP',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (10, 'REST',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (11, 'HTML',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (12, 'CSS',true); +INSERT INTO ie_subject (s_id, s_subject, s_is_active) VALUES (13, 'Servlets',true); -- ie_question_pool -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (1, 'What is a lambda?', 30, 30, 1, 18, '2017-03-21'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (2, 'What is autoboxing?', 20, 20, 1, 0, NULL); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (3, 'Describe the heap and stack.', 30, 30, 1, 0, NULL); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (4, 'What are the steps to create and run a new thread?', 30, 30, 1, 0, NULL); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (5, 'What are static variables and methods?', 20, 20, 1, 0, NULL); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (6, 'What is a singleton, and how do you create one?', 30, 30, 1, 0, NULL); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (7, 'Describe the Collections Framework.', 40, 40, 1, 2, '2017-03-14'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (8, 'What is a Spring bean?', 25, 20, 2, 1, '2017-03-03'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (9, 'What are the different types of dependency injection?', 10, 10, 2, 1, '2017-03-06'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (10, 'What does SQL stand for?', 3, 3, 3, 14, '2017-03-21'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (11, 'What are joins?', 20, 20, 3, 14, '2017-03-21'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (12, 'What is SQL injection?', 15, 15, 3, 1, '2017-03-06'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (13, 'What are the four ways to call a function?', 25, 25, 4, 1, '2017-03-06'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (14, 'What is jQuery?', 10, 10, 4, 1, '2017-03-08'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (15, 'How do you execute code after an asynchronous request?', 40, 40, 4, 1, '2017-03-06'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (16, 'What is ORM?', 20, 20, 5, 2, '2017-03-06'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (17, 'What are the three beans....?', 2, 2, 5, 5, '2017-03-13'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (18, 'How are joins handled in Hibernate?', 2, 2, 5, 5, '2017-03-13'); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (19, 'Which AWS service is used to host a database?', 5, 5, 7, 0, NULL); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (20, 'What are the three ways/places to define CSS styles, and which is preferred?', 10, 10, 12, 0, NULL); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (21, 'What is a Servlet?', 20, 20, 13, 0, NULL); -INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used) VALUES (22, 'What is the lifecycle of a Servlet?', 20, 20, 13, 0, NULL); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (1, 'What is a lambda?', 30, 30, 1, 18, '2017-03-21',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (2, 'What is autoboxing?', 20, 20, 1, 0, NULL,true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (3, 'Describe the heap and stack.', 30, 30, 1, 0, NULL,true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (4, 'What are the steps to create and run a new thread?', 30, 30, 1, 0, NULL,true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (5, 'What are static variables and methods?', 20, 20, 1, 0, NULL,true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (6, 'What is a singleton, and how do you create one?', 30, 30, 1, 0, NULL,true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (7, 'Describe the Collections Framework.', 40, 40, 1, 2, '2017-03-14',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (8, 'What is a Spring bean?', 25, 20, 2, 1, '2017-03-03',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (9, 'What are the different types of dependency injection?', 10, 10, 2, 1, '2017-03-06',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (10, 'What does SQL stand for?', 3, 3, 3, 14, '2017-03-21',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (11, 'What are joins?', 20, 20, 3, 14, '2017-03-21',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (12, 'What is SQL injection?', 15, 15, 3, 1, '2017-03-06',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (13, 'What are the four ways to call a function?', 25, 25, 4, 1, '2017-03-06',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (14, 'What is jQuery?', 10, 10, 4, 1, '2017-03-08',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (15, 'How do you execute code after an asynchronous request?', 40, 40, 4, 1, '2017-03-06',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (16, 'What is ORM?', 20, 20, 5, 2, '2017-03-06',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (17, 'What are the three beans....?', 2, 2, 5, 5, '2017-03-13',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (18, 'How are joins handled in Hibernate?', 2, 2, 5, 5, '2017-03-13',true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (19, 'Which AWS service is used to host a database?', 5, 5, 7, 0, NULL,true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (20, 'What are the three ways/places to define CSS styles, and which is preferred?', 10, 10, 12, 0, NULL,true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (21, 'What is a Servlet?', 20, 20, 13, 0, NULL,true); +INSERT INTO ie_question_pool (qp_id, qp_question_text, qp_max_communication_score, qp_max_knowledge_score, qp_sid, qp_count, qp_last_date_used, qp_is_active) VALUES (22, 'What is the lifecycle of a Servlet?', 20, 20, 13, 0, NULL,true); -- ie_batch -INSERT INTO ie_batch (b_id, b_name) VALUES (1, '1701 Jan09 Java ASU'); -INSERT INTO ie_batch (b_id, b_name) VALUES (2, '1702 Java CUNY'); -INSERT INTO ie_batch (b_id, b_name) VALUES (3, '1610 Oct17 NET'); -INSERT INTO ie_batch (b_id, b_name) VALUES (4, '1607 Jul25 NET'); -INSERT INTO ie_batch (b_id, b_name) VALUES (5, '1608 August29 SDET'); -INSERT INTO ie_batch (b_id, b_name) VALUES (6, '1606 June20 SDET'); +INSERT INTO ie_batch (b_id, b_name, b_is_active) VALUES (1, '1701 Jan09 Java ASU',true); +INSERT INTO ie_batch (b_id, b_name, b_is_active) VALUES (2, '1702 Java CUNY',true); +INSERT INTO ie_batch (b_id, b_name, b_is_active) VALUES (3, '1610 Oct17 NET',true); +INSERT INTO ie_batch (b_id, b_name, b_is_active) VALUES (4, '1607 Jul25 NET',true); +INSERT INTO ie_batch (b_id, b_name, b_is_active) VALUES (5, '1608 August29 SDET',true); +INSERT INTO ie_batch (b_id, b_name, b_is_active) VALUES (6, '1606 June20 SDET',true); -- ie_person -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (1, 'Hafthor', 'Bjornsson', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (2, 'Bruce', 'Willis', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (3, 'Michael', 'Jordan', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (4, 'Bill', 'Clintin', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (5, 'Tom', 'Cruise', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (6, 'Brad', 'Pitt', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (7, 'Efren', 'Olivas', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (8, 'Barack', 'Obama', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (9, 'Oprah', 'Winfrey', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (10, 'John', 'Wayne', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (11, 'Kim', 'Kardashian', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (12, 'David', 'Letterman', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (13, 'Frank', 'Sinatra', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (14, 'Maximus', 'Decimus', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (15, 'Stephen', 'Hawking', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (16, 'Homer', 'Simpson', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (17, 'Jack', 'Bauer', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (18, 'Lance', 'Armstrong', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (19, 'Bill', 'Burr', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (20, 'Mother', 'Teresa', 1); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (21, 'Winston', 'Churchill', 2); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (22, 'Mahatma', 'Ghandi', 2); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (23, 'George', 'Orwell', 2); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (24, 'Paul', 'McCartney', 2); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (25, 'Joseph', 'Smith', 2); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (26, 'Adam', 'Smith', 3); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (27, 'Bill', 'Gates', 3); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (28, 'Rosa', 'Parks', 3); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (29, 'Julius', 'Caesar', 3); -INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role) VALUES (30, 'Donald', 'Trump', 3); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (1, 'Hafthor', 'Bjornsson', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (2, 'Bruce', 'Willis', 1,false); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (3, 'Michael', 'Jordan', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (4, 'Bill', 'Clintin', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (5, 'Tom', 'Cruise', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (6, 'Brad', 'Pitt', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (7, 'Efren', 'Olivas', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (8, 'Barack', 'Obama', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (9, 'Oprah', 'Winfrey', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (10, 'John', 'Wayne', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (11, 'Kim', 'Kardashian', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (12, 'David', 'Letterman', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (13, 'Frank', 'Sinatra', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (14, 'Maximus', 'Decimus', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (15, 'Stephen', 'Hawking', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (16, 'Homer', 'Simpson', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (17, 'Jack', 'Bauer', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (18, 'Lance', 'Armstrong', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (19, 'Bill', 'Burr', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (20, 'Mother', 'Teresa', 1,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (21, 'Winston', 'Churchill', 2,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (22, 'Mahatma', 'Ghandi', 2,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (23, 'George', 'Orwell', 2,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (24, 'Paul', 'McCartney', 2,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (25, 'Joseph', 'Smith', 2,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (26, 'Adam', 'Smith', 3,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (27, 'Bill', 'Gates', 3,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (28, 'Rosa', 'Parks', 3,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (29, 'Julius', 'Caesar', 3,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (30, 'Donald', 'Trump', 3,true); +INSERT INTO ie_person (p_id, p_firstname, p_lastname, p_role, p_is_active) VALUES (31, 'David', 'Deleted-ton', 1,false); -- ie_person_batch INSERT INTO ie_person_batch (join_id, person_id, batch_id) VALUES (1, 1, 1); @@ -112,104 +113,104 @@ INSERT INTO ie_person_batch (join_id, person_id, batch_id) VALUES (19, 19, 4); INSERT INTO ie_person_batch (join_id, person_id, batch_id) VALUES (20, 20, 4); -- ie_eval -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (1, 1, '2017-01-17', 1, 1, 1); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (2, 1, '2017-01-17', 1, 2, 1); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (3, 2, '2017-01-23', 1, 1, 1); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (4, 2, '2017-01-23', 1, 2, 1); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (5, 3, '2017-01-30', 1, 1, 1); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (6, 3, '2017-01-30', 1, 2, 1); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (7, 4, '2017-02-6', 1, 1, 1); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (8, 4, '2017-02-6', 1, 2, 1); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (9, 5, '2017-02-13', 1, 3, 1); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (10, 1, '2017-01-17', 1, 1, 2); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (11, 1, '2017-01-17', 1, 2, 2); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (12, 2, '2017-01-23', 1, 1, 2); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (13, 2, '2017-01-23', 1, 2, 2); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (14, 3, '2017-01-30', 1, 1, 2); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (15, 3, '2017-01-30', 1, 2, 2); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (16, 4, '2017-02-6', 1, 1, 2); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (17, 4, '2017-02-6', 1, 2, 2); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (18, 5, '2017-02-13', 1, 3, 2); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (19, 1, '2017-01-17', 1, 1, 3); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (20, 1, '2017-01-17', 1, 2, 3); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (21, 2, '2017-01-23', 1, 1, 3); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (22, 2, '2017-01-23', 1, 2, 3); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (23, 3, '2017-01-30', 1, 1, 3); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (24, 3, '2017-01-30', 1, 2, 3); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (25, 4, '2017-02-6', 1, 1, 3); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (26, 4, '2017-02-6', 1, 2, 3); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (27, 5, '2017-02-13', 1, 3, 3); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (28, 1, '2017-01-17', 1, 1, 4); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (29, 1, '2017-01-17', 1, 2, 4); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (30, 2, '2017-01-23', 1, 1, 4); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (31, 2, '2017-01-23', 1, 2, 4); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (32, 3, '2017-01-30', 1, 1, 4); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (33, 3, '2017-01-30', 1, 2, 4); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (34, 4, '2017-02-6', 1, 1, 4); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (35, 4, '2017-02-6', 1, 2, 4); -INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch) VALUES (36, 5, '2017-02-13', 1, 3, 4); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (1, 1, '2017-01-17', 1, 1, 1,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (2, 1, '2017-01-17', 1, 2, 1,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (3, 2, '2017-01-23', 1, 1, 1,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (4, 2, '2017-01-23', 1, 2, 1,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (5, 3, '2017-01-30', 1, 1, 1,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (6, 3, '2017-01-30', 1, 2, 1,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (7, 4, '2017-02-6', 1, 1, 1,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (8, 4, '2017-02-6', 1, 2, 1,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (9, 5, '2017-02-13', 1, 3, 1,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (10, 1, '2017-01-17', 1, 1, 2,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (11, 1, '2017-01-17', 1, 2, 2,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (12, 2, '2017-01-23', 1, 1, 2,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (13, 2, '2017-01-23', 1, 2, 2,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (14, 3, '2017-01-30', 1, 1, 2,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (15, 3, '2017-01-30', 1, 2, 2,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (16, 4, '2017-02-6', 1, 1, 2,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (17, 4, '2017-02-6', 1, 2, 2,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (18, 5, '2017-02-13', 1, 3, 2,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (19, 1, '2017-01-17', 1, 1, 3,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (20, 1, '2017-01-17', 1, 2, 3,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (21, 2, '2017-01-23', 1, 1, 3,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (22, 2, '2017-01-23', 1, 2, 3,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (23, 3, '2017-01-30', 1, 1, 3,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (24, 3, '2017-01-30', 1, 2, 3,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (25, 4, '2017-02-6', 1, 1, 3,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (26, 4, '2017-02-6', 1, 2, 3,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (27, 5, '2017-02-13', 1, 3, 3,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (28, 1, '2017-01-17', 1, 1, 4,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (29, 1, '2017-01-17', 1, 2, 4,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (30, 2, '2017-01-23', 1, 1, 4,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (31, 2, '2017-01-23', 1, 2, 4,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (32, 3, '2017-01-30', 1, 1, 4,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (33, 3, '2017-01-30', 1, 2, 4,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (34, 4, '2017-02-6', 1, 1, 4,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (35, 4, '2017-02-6', 1, 2, 4,true); +INSERT INTO ie_eval (e_id, e_week, e_date, e_eval_type, e_pid_trainee, e_batch, e_is_active) VALUES (36, 5, '2017-02-13', 1, 3, 4,true); -- ie_eval_comment -INSERT INTO ie_eval_comment (ec_id, ec_text, ec_eid) VALUES (1, 'Needs to work on core java.', 1); -INSERT INTO ie_eval_comment (ec_id, ec_text, ec_eid) VALUES (2, 'Re-evaluate on SOAP.', 36); +INSERT INTO ie_eval_comment (ec_id, ec_text, ec_eid,ec_is_active) VALUES (1, 'Needs to work on core java.', 1,true); +INSERT INTO ie_eval_comment (ec_id, ec_text, ec_eid,ec_is_active) VALUES (2, 'Re-evaluate on SOAP.', 36,true); -- ie_question_eval -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (1, 20, 17, 1, 1); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (2, 28, 30, 1, 3); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (3, 5, 2, 1, 4); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (4, 3, 3, 3, 10); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (5, 15, 15, 3, 12); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (6, 10, 10, 3, 11); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (7, 10, 10, 5, 21); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (8, 15, 15, 5, 22); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (9, 8, 10, 7, 20); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (10, 20, 20, 7, 13); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (11, 5, 10, 7, 15); - -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (12, 19, 17, 10, 1); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (13, 20, 20, 10, 2); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (14, 20, 25, 10, 4); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (15, 3, 3, 12, 10); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (16, 15, 15, 12, 12); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (17, 10, 10, 12, 11); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (18, 10, 10, 14, 21); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (19, 15, 15, 14, 22); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (20, 10, 10, 16, 20); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (21, 20, 23, 16, 13); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (22, 40, 40, 16, 15); - -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (23, 20, 17, 19, 2); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (24, 20, 20, 19, 5); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (25, 5, 2, 19, 4); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (26, 32, 35, 19, 7); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (27, 15, 15, 21, 12); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (28, 10, 10, 21, 11); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (29, 10, 10, 23, 21); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (30, 15, 15, 23, 22); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (31, 8, 10, 25, 20); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (32, 10, 10, 25, 14); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (33, 25, 10, 25, 15); - -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (34, 20, 17, 28, 3); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (35, 28, 30, 28, 6); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (36, 5, 2, 28, 4); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (37, 3, 3, 30, 10); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (38, 15, 15, 30, 12); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (39, 10, 10, 30, 11); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (40, 10, 10, 32, 21); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (41, 15, 15, 32, 22); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (42, 8, 10, 34, 20); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (43, 20, 20, 34, 13); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (44, 5, 10, 34, 15); - -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (45, 20, 20, 2, 2); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (46, 0, 0, 4, 3); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (47, 25, 25, 6, 3); - -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (48, 20, 20, 9, 5); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (49, 17, 20, 18, 11); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (50, 0, 0, 27, 17); -INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid) VALUES (51, 8, 8, 36, 20); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (1, 20, 17, 1, 1,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (2, 28, 30, 1, 3,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (3, 5, 2, 1, 4,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (4, 3, 3, 3, 10,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (5, 15, 15, 3, 12,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (6, 10, 10, 3, 11,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (7, 10, 10, 5, 21,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (8, 15, 15, 5, 22,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (9, 8, 10, 7, 20,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (10, 20, 20, 7, 13,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (11, 5, 10, 7, 15,true); + +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (12, 19, 17, 10, 1,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (13, 20, 20, 10, 2,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (14, 20, 25, 10, 4,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (15, 3, 3, 12, 10,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (16, 15, 15, 12, 12,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (17, 10, 10, 12, 11,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (18, 10, 10, 14, 21,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (19, 15, 15, 14, 22,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (20, 10, 10, 16, 20,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (21, 20, 23, 16, 13,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (22, 40, 40, 16, 15,true); + +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (23, 20, 17, 19, 2,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (24, 20, 20, 19, 5,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (25, 5, 2, 19, 4,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (26, 32, 35, 19, 7,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (27, 15, 15, 21, 12,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (28, 10, 10, 21, 11,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (29, 10, 10, 23, 21,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (30, 15, 15, 23, 22,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (31, 8, 10, 25, 20,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (32, 10, 10, 25, 14,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (33, 25, 10, 25, 15,true); + +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (34, 20, 17, 28, 3,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (35, 28, 30, 28, 6,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (36, 5, 2, 28, 4,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (37, 3, 3, 30, 10,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (38, 15, 15, 30, 12,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (39, 10, 10, 30, 11,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (40, 10, 10, 32, 21,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (41, 15, 15, 32, 22,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (42, 8, 10, 34, 20,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (43, 20, 20, 34, 13,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (44, 5, 10, 34, 15,true); + +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (45, 20, 20, 2, 2,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (46, 0, 0, 4, 3,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (47, 25, 25, 6, 3,true); + +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (48, 20, 20, 9, 5,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (49, 17, 20, 18, 11,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (50, 0, 0, 27, 17,true); +INSERT INTO ie_question_eval (qe_id, qe_communication_score, qe_knowledge_score, qe_eid, qe_qpid, qe_is_active) VALUES (51, 8, 8, 36, 20,true); -- ie_question_comment -INSERT INTO ie_question_comment (qc_id, qc_comment_text, qc_eid) VALUES (1, 'Knew what it was but not how to implement it.', 1); \ No newline at end of file +INSERT INTO ie_question_comment (qc_id, qc_comment_text, qc_eid,qc_is_active) VALUES (1, 'Knew what it was but not how to implement it.', 1,true); \ No newline at end of file diff --git a/src/main/java/com/revature/controllers/AdminController.java b/src/main/java/com/revature/controllers/AdminController.java new file mode 100644 index 0000000..37c25be --- /dev/null +++ b/src/main/java/com/revature/controllers/AdminController.java @@ -0,0 +1,31 @@ +package com.revature.controllers; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import com.revature.services.PersonLogic; + +@CrossOrigin +@RestController +@RequestMapping(value = "/api/v1/admin/") +public class AdminController { + + + @Autowired + private PersonLogic personLogic; + + + @RequestMapping(method = RequestMethod.DELETE, value = "persons/{personId}") + public ResponseEntity deletePerson(@PathVariable Integer personId){ + return ResponseEntity.ok(personLogic.deletePersonAdmin(personId)); + } + + + + +} diff --git a/src/main/java/com/revature/controllers/PersonController.java b/src/main/java/com/revature/controllers/PersonController.java index 21f136f..afb9da2 100644 --- a/src/main/java/com/revature/controllers/PersonController.java +++ b/src/main/java/com/revature/controllers/PersonController.java @@ -55,7 +55,7 @@ public ResponseEntity> getPerson(Pageable pageable, @RequestParam(d return ResponseEntity.ok(personLogic.getPersonsByLastnameAndPersonRole(pageable, lastname, roleSearch)); } else if((!"".equals(firstname)) && !("".equals(lastname))) { return ResponseEntity.ok(personLogic.getPersonsByFirstnameAndLastnameAndPersonRole(pageable, firstname, lastname, roleSearch)); - } else{ + } else{ //if roleSearch is null the return will be all persons with isActive=true return ResponseEntity.ok(personLogic.getAllPersonsByPersonRole(pageable, roleSearch)); } diff --git a/src/main/java/com/revature/domain/Batch.java b/src/main/java/com/revature/domain/Batch.java index 647b11b..0760014 100644 --- a/src/main/java/com/revature/domain/Batch.java +++ b/src/main/java/com/revature/domain/Batch.java @@ -28,15 +28,19 @@ public class Batch { @Column(name="b_name") private String name; + @Column(name="b_is_active") + private boolean isActive; + @ManyToMany @JoinTable(name="ie_person_batch", joinColumns=@JoinColumn(name="batch_id"), inverseJoinColumns=@JoinColumn(name="person_id")) private Set persons; public Batch() {} - public Batch(String name) { + public Batch(String name, boolean isActive) { super(); this.name = name; + this.isActive = isActive; } public Set getPersons(){ @@ -62,12 +66,21 @@ public String getName() { public void setName(String name) { this.name = name; } + + public void setisActive(boolean isActive){ + this.isActive = isActive; + } + + public boolean isActive(){ + return isActive; + } @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + id; + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + (isActive ? 1231 : 1237); result = prime * result + ((name == null) ? 0 : name.hashCode()); return result; } @@ -81,7 +94,12 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) return false; Batch other = (Batch) obj; - if (id != other.id) + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (isActive != other.isActive) return false; if (name == null) { if (other.name != null) @@ -93,8 +111,7 @@ public boolean equals(Object obj) { @Override public String toString() { - return "Batch [id=" + id + ", name=" + name+ "]"; + return "Batch [id=" + id + ", name=" + name + ", isActive=" + isActive + "]"; } - } diff --git a/src/main/java/com/revature/domain/Eval.java b/src/main/java/com/revature/domain/Eval.java index b2ae1e8..28bfda5 100644 --- a/src/main/java/com/revature/domain/Eval.java +++ b/src/main/java/com/revature/domain/Eval.java @@ -43,6 +43,9 @@ public class Eval implements Serializable{ @OneToMany(mappedBy="eval", cascade = CascadeType.ALL) private List comments; + @Column(name="e_is_active") + private boolean isActive; + @Transient private int evalKnowledgeScore; @@ -58,7 +61,7 @@ public class Eval implements Serializable{ public Eval() {/*empty constructor needed*/} public Eval(Integer week, Date date, EvalType evalType, Person trainee, Batch batch, - List questions, List comments) { + List questions, List comments, boolean isActive) { super(); this.week = week; this.date = date; @@ -67,6 +70,7 @@ public Eval(Integer week, Date date, EvalType evalType, Person trainee, Batch ba this.batch = batch; this.questions = questions; this.comments = comments; + this.isActive = isActive; } public Integer getId() { @@ -133,6 +137,14 @@ public void setComments(List comments) { this.comments = comments; } + public boolean isActive() { + return isActive; + } + + public void setisActive(boolean isActive) { + this.isActive = isActive; + } + public int getEvalKnowledgeScore() { return evalKnowledgeScore; } @@ -164,7 +176,7 @@ public int getEvalMaxCommunicationScore() { public void setEvalMaxCommunicationScore(int evalMaxCommunicationScore) { this.evalMaxCommunicationScore = evalMaxCommunicationScore; } - + @Override public int hashCode() { final int prime = 31; @@ -174,6 +186,7 @@ public int hashCode() { result = prime * result + ((date == null) ? 0 : date.hashCode()); result = prime * result + ((evalType == null) ? 0 : evalType.hashCode()); result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + (isActive ? 1231 : 1237); result = prime * result + ((questions == null) ? 0 : questions.hashCode()); result = prime * result + ((trainee == null) ? 0 : trainee.hashCode()); result = prime * result + ((week == null) ? 0 : week.hashCode()); @@ -214,6 +227,8 @@ public boolean equals(Object obj) { return false; } else if (!id.equals(other.id)) return false; + if (isActive != other.isActive) + return false; if (questions == null) { if (other.questions != null) return false; @@ -235,8 +250,8 @@ public boolean equals(Object obj) { @Override public String toString() { return "Eval [id=" + id + ", week=" + week + ", date=" + date + ", evalType=" + evalType + ", trainee=" - + trainee + ", batch=" + batch + ", questions=" + questions + ", comments=" + comments + "]"; + + trainee + ", batch=" + batch + ", questions=" + questions + ", comments=" + comments + ", isActive=" + + isActive + "]"; } - } diff --git a/src/main/java/com/revature/domain/EvalComment.java b/src/main/java/com/revature/domain/EvalComment.java index 609885e..2421d76 100644 --- a/src/main/java/com/revature/domain/EvalComment.java +++ b/src/main/java/com/revature/domain/EvalComment.java @@ -22,12 +22,16 @@ public class EvalComment implements Serializable { @JoinColumn(name="ec_eid") private Eval eval; + @Column(name="ec_is_active") + private boolean isActive; + public EvalComment(){} - public EvalComment(String commentText, Eval eval) { + public EvalComment(String commentText, Eval eval, boolean isActive) { super(); this.commentText = commentText; this.eval = eval; + this.isActive=isActive; } public Integer getId() { @@ -54,14 +58,22 @@ public Eval getEval() { public void setEval(Eval eval) { this.eval = eval; } + + public boolean isActive() { + return isActive; + } + + public void setisActive(boolean isActive) { + this.isActive = isActive; + } @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + ((commentText == null) ? 0 : commentText.hashCode()); -// result = prime * result + ((eval == null) ? 0 : eval.hashCode()); result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + (isActive ? 1231 : 1237); return result; } @@ -79,21 +91,19 @@ public boolean equals(Object obj) { return false; } else if (!commentText.equals(other.commentText)) return false; - if (eval == null) { - if (other.eval != null) - return false; - } else if (!eval.equals(other.eval)) - return false; if (id == null) { if (other.id != null) return false; } else if (!id.equals(other.id)) return false; + if (isActive != other.isActive) + return false; return true; } @Override public String toString() { - return "EvalComment [id=" + id + ", commentText=" + commentText + "]"; + return "EvalComment [id=" + id + ", commentText=" + commentText + ", isActive=" + isActive + "]"; } + } diff --git a/src/main/java/com/revature/domain/EvalType.java b/src/main/java/com/revature/domain/EvalType.java index 1e9037d..48cd1d9 100644 --- a/src/main/java/com/revature/domain/EvalType.java +++ b/src/main/java/com/revature/domain/EvalType.java @@ -18,6 +18,9 @@ public class EvalType implements Serializable { @Column(name="et_description") private String description; + @Column(name="et_is_active") + private boolean isActive; + public EvalType() {/*empty constructor needed*/} public Integer getId() { @@ -35,39 +38,53 @@ public String getDescription() { public void setDescription(String description) { this.description = description; } + + + public boolean isActive() { + return isActive; + } + + public void setisActive(boolean isActive) { + this.isActive = isActive; + } @Override public int hashCode() { - int hash = 3; - hash = 19 * hash + Objects.hashCode(this.id); - hash = 19 * hash + Objects.hashCode(this.description); - return hash; + final int prime = 31; + int result = 1; + result = prime * result + ((description == null) ? 0 : description.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + (isActive ? 1231 : 1237); + return result; } @Override public boolean equals(Object obj) { - if (this == obj) { + if (this == obj) return true; - } - if (obj == null) { + if (obj == null) + return false; + if (getClass() != obj.getClass()) return false; - } - if (getClass() != obj.getClass()) { + EvalType other = (EvalType) obj; + if (description == null) { + if (other.description != null) + return false; + } else if (!description.equals(other.description)) return false; - } - final EvalType other = (EvalType) obj; - if (!Objects.equals(this.description, other.description)) { + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) return false; - } - if (!Objects.equals(this.id, other.id)) { + if (isActive != other.isActive) return false; - } return true; } @Override public String toString() { - return "EvalType{" + "id=" + id + ", description=" + description + '}'; + return "EvalType [id=" + id + ", description=" + description + ", isActive=" + isActive + "]"; } } diff --git a/src/main/java/com/revature/domain/Person.java b/src/main/java/com/revature/domain/Person.java index c69cd1b..6c139d3 100644 --- a/src/main/java/com/revature/domain/Person.java +++ b/src/main/java/com/revature/domain/Person.java @@ -37,17 +37,21 @@ public class Person { @JoinColumn(name = "p_role", nullable = false) private PersonRole personRole; + @Column(name = "p_is_active", nullable = false) + private boolean isActive; + @JsonIgnore @ManyToMany(fetch=FetchType.EAGER, cascade=CascadeType.ALL, mappedBy="persons") private Set batches; public Person() {/*empty constructor needed*/} - public Person(String firstName, String lastName, PersonRole personRole) { + public Person(String firstName, String lastName, PersonRole personRole, boolean isActive) { super(); this.firstName = firstName; this.lastName = lastName; this.personRole = personRole; + this.isActive = isActive; } public Set getBatches(){ @@ -89,20 +93,28 @@ public PersonRole getPersonRole() { public void setPersonRole(PersonRole personRole) { this.personRole = personRole; } - + + public boolean isActive(){ + return isActive; + } + + public void setisActive(boolean del){ + this.isActive = del; + } @Override public int hashCode() { final int prime = 31; int result = 1; + result = prime * result + ((batches == null) ? 0 : batches.hashCode()); result = prime * result + ((firstName == null) ? 0 : firstName.hashCode()); result = prime * result + id; + result = prime * result + (isActive ? 1231 : 1237); result = prime * result + ((lastName == null) ? 0 : lastName.hashCode()); result = prime * result + ((personRole == null) ? 0 : personRole.hashCode()); return result; } - @Override public boolean equals(Object obj) { if (this == obj) @@ -112,6 +124,11 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) return false; Person other = (Person) obj; + if (batches == null) { + if (other.batches != null) + return false; + } else if (!batches.equals(other.batches)) + return false; if (firstName == null) { if (other.firstName != null) return false; @@ -119,6 +136,8 @@ public boolean equals(Object obj) { return false; if (id != other.id) return false; + if (isActive != other.isActive) + return false; if (lastName == null) { if (other.lastName != null) return false; @@ -132,13 +151,11 @@ public boolean equals(Object obj) { return true; } - @Override public String toString() { - return "Person [id=" + id + ", firstName=" + firstName + ", lastName=" + lastName + ", personRole=" + personRole + "]"; + return "Person [id=" + id + ", firstName=" + firstName + ", lastName=" + lastName + ", isActive=" + isActive + + ", personRole=" + personRole + ", batches=" + batches + "]"; } - - } diff --git a/src/main/java/com/revature/domain/PersonRole.java b/src/main/java/com/revature/domain/PersonRole.java index 8684513..ee65129 100644 --- a/src/main/java/com/revature/domain/PersonRole.java +++ b/src/main/java/com/revature/domain/PersonRole.java @@ -15,11 +15,15 @@ public class PersonRole { @Column(name = "pr_title") private String title; + + @Column(name = "pr_is_active") + private boolean isActive; - public PersonRole(int id, String title) { + public PersonRole(int id, String title, boolean isActive) { super(); this.id = id; this.title = title; + this.isActive=isActive; } public PersonRole(){ @@ -42,11 +46,21 @@ public void setTitle(String title) { this.title = title; } + + public boolean isActive() { + return isActive; + } + + public void setDeleted(boolean isActive) { + this.isActive = isActive; + } + @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + id; + result = prime * result + (isActive ? 1231 : 1237); result = prime * result + ((title == null) ? 0 : title.hashCode()); return result; } @@ -62,6 +76,8 @@ public boolean equals(Object obj) { PersonRole other = (PersonRole) obj; if (id != other.id) return false; + if (isActive != other.isActive) + return false; if (title == null) { if (other.title != null) return false; @@ -72,8 +88,8 @@ public boolean equals(Object obj) { @Override public String toString() { - return "PersonRole [id=" + id + ", title=" + title + "]"; + return "PersonRole [id=" + id + ", title=" + title + ", isActive=" + isActive + "]"; } - + } diff --git a/src/main/java/com/revature/domain/QuestionComment.java b/src/main/java/com/revature/domain/QuestionComment.java index e57f79c..9438ad2 100644 --- a/src/main/java/com/revature/domain/QuestionComment.java +++ b/src/main/java/com/revature/domain/QuestionComment.java @@ -19,16 +19,20 @@ public class QuestionComment implements Serializable { @Column(name="qc_comment_text") private String commentText; + @Column(name="qc_is_active") + private boolean isActive; + @ManyToOne(fetch=FetchType.EAGER) @JoinColumn(name="qc_eid") private QuestionEval questionEval; public QuestionComment(){} - public QuestionComment(String commentText, QuestionEval eval) { + public QuestionComment(String commentText, QuestionEval eval, boolean isActive) { super(); this.commentText = commentText; this.questionEval = eval; + this.isActive=isActive; } public Integer getId() { @@ -56,13 +60,22 @@ public void setQuestionEval(QuestionEval questionEval) { this.questionEval = questionEval; } + + public boolean isActive() { + return isActive; + } + + public void setisActive(boolean isActive) { + this.isActive = isActive; + } + @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + ((commentText == null) ? 0 : commentText.hashCode()); -// result = prime * result + ((eval == null) ? 0 : eval.hashCode()); result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + (isActive ? 1231 : 1237); return result; } @@ -80,22 +93,19 @@ public boolean equals(Object obj) { return false; } else if (!commentText.equals(other.commentText)) return false; - if (questionEval == null) { - if (other.questionEval != null) - return false; - } else if (!questionEval.equals(other.questionEval)) - return false; if (id == null) { if (other.id != null) return false; } else if (!id.equals(other.id)) return false; + if (isActive != other.isActive) + return false; return true; } @Override public String toString() { - return "QuestionComment [id=" + id + ", commentText=" + commentText + "]"; + return "QuestionComment [id=" + id + ", commentText=" + commentText + ", isActive=" + isActive + "]"; } diff --git a/src/main/java/com/revature/domain/QuestionEval.java b/src/main/java/com/revature/domain/QuestionEval.java index 416ca8b..cb5d723 100644 --- a/src/main/java/com/revature/domain/QuestionEval.java +++ b/src/main/java/com/revature/domain/QuestionEval.java @@ -23,6 +23,9 @@ public class QuestionEval implements Serializable { @Column(name="qe_knowledge_score") private Integer knowledgeScore; + @Column(name="qe_is_active") + private boolean isActive; + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name="qe_eid") private Eval eval; @@ -37,12 +40,13 @@ public class QuestionEval implements Serializable { public QuestionEval(){} public QuestionEval(Integer communicationScore, Integer knowledgeScore, Eval eval, - QuestionPool questionPool) { + QuestionPool questionPool, boolean isActive) { super(); this.communicationScore = communicationScore; this.knowledgeScore = knowledgeScore; this.eval = eval; this.questionPool = questionPool; + this.isActive=isActive; } public Integer getId() { @@ -93,55 +97,79 @@ public List getComments() { public void setComments(List comments) { this.comments = comments; } + + public boolean isActive() { + return isActive; + } + + public void setDeleted(boolean isActive) { + this.isActive = isActive; + } @Override public int hashCode() { - int hash = 5; - hash = 41 * hash + Objects.hashCode(this.id); - hash = 41 * hash + Objects.hashCode(this.communicationScore); - hash = 41 * hash + Objects.hashCode(this.knowledgeScore); - hash = 41 * hash + Objects.hashCode(this.eval); - hash = 41 * hash + Objects.hashCode(this.questionPool); - hash = 41 * hash + Objects.hashCode(this.comments); - return hash; + final int prime = 31; + int result = 1; + result = prime * result + ((comments == null) ? 0 : comments.hashCode()); + result = prime * result + ((communicationScore == null) ? 0 : communicationScore.hashCode()); + result = prime * result + ((eval == null) ? 0 : eval.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + (isActive ? 1231 : 1237); + result = prime * result + ((knowledgeScore == null) ? 0 : knowledgeScore.hashCode()); + result = prime * result + ((questionPool == null) ? 0 : questionPool.hashCode()); + return result; } @Override public boolean equals(Object obj) { - if (this == obj) { + if (this == obj) return true; - } - if (obj == null) { + if (obj == null) return false; - } - if (getClass() != obj.getClass()) { + if (getClass() != obj.getClass()) return false; - } - final QuestionEval other = (QuestionEval) obj; - if (!Objects.equals(this.id, other.id)) { + QuestionEval other = (QuestionEval) obj; + if (comments == null) { + if (other.comments != null) + return false; + } else if (!comments.equals(other.comments)) return false; - } - if (!Objects.equals(this.communicationScore, other.communicationScore)) { + if (communicationScore == null) { + if (other.communicationScore != null) + return false; + } else if (!communicationScore.equals(other.communicationScore)) return false; - } - if (!Objects.equals(this.knowledgeScore, other.knowledgeScore)) { + if (eval == null) { + if (other.eval != null) + return false; + } else if (!eval.equals(other.eval)) return false; - } - if (!Objects.equals(this.eval, other.eval)) { + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) return false; - } - if (!Objects.equals(this.questionPool, other.questionPool)) { + if (isActive != other.isActive) return false; - } - if (!Objects.equals(this.comments, other.comments)) { + if (knowledgeScore == null) { + if (other.knowledgeScore != null) + return false; + } else if (!knowledgeScore.equals(other.knowledgeScore)) + return false; + if (questionPool == null) { + if (other.questionPool != null) + return false; + } else if (!questionPool.equals(other.questionPool)) return false; - } return true; } - + @Override public String toString() { - return "QuestionEval{" + "id=" + id + ", communicationScore=" + communicationScore + ", knowledgeScore=" + knowledgeScore + ", questionPool=" + questionPool + ", comments=" + comments + '}'; - } + return "QuestionEval [id=" + id + ", communicationScore=" + communicationScore + ", knowledgeScore=" + + knowledgeScore + ", isActive=" + isActive + ", eval=" + eval + ", questionPool=" + questionPool + + ", comments=" + comments + "]"; + } + } diff --git a/src/main/java/com/revature/domain/QuestionPool.java b/src/main/java/com/revature/domain/QuestionPool.java index c65ef1c..010a592 100644 --- a/src/main/java/com/revature/domain/QuestionPool.java +++ b/src/main/java/com/revature/domain/QuestionPool.java @@ -35,10 +35,13 @@ public class QuestionPool implements Serializable { @Column(name="qp_last_date_used") private Date dateLastUsed; + @Column(name="qp_is_active") + private boolean isActive; + public QuestionPool(){} public QuestionPool(String questionText, Integer maxCommunicationScore, Integer maxKnowledgeScore, - Subject subject, Integer useCount, Date dateLastUsed) { + Subject subject, Integer useCount, Date dateLastUsed, boolean isActive) { super(); this.questionText = questionText; this.maxCommunicationScore = maxCommunicationScore; @@ -46,6 +49,7 @@ public QuestionPool(String questionText, Integer maxCommunicationScore, Integer this.subject = subject; this.useCount = useCount; this.dateLastUsed = dateLastUsed; + this.isActive=isActive; } public Integer getId() { @@ -104,12 +108,22 @@ public void setDateLastUsed(Date dateLastUsed) { this.dateLastUsed = dateLastUsed; } + + public boolean isActive() { + return isActive; + } + + public void setisActive(boolean isActive) { + this.isActive = isActive; + } + @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + ((dateLastUsed == null) ? 0 : dateLastUsed.hashCode()); result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + (isActive ? 1231 : 1237); result = prime * result + ((maxCommunicationScore == null) ? 0 : maxCommunicationScore.hashCode()); result = prime * result + ((maxKnowledgeScore == null) ? 0 : maxKnowledgeScore.hashCode()); result = prime * result + ((questionText == null) ? 0 : questionText.hashCode()); @@ -137,6 +151,8 @@ public boolean equals(Object obj) { return false; } else if (!id.equals(other.id)) return false; + if (isActive != other.isActive) + return false; if (maxCommunicationScore == null) { if (other.maxCommunicationScore != null) return false; @@ -169,7 +185,8 @@ public boolean equals(Object obj) { public String toString() { return "QuestionPool [id=" + id + ", questionText=" + questionText + ", maxCommunicationScore=" + maxCommunicationScore + ", maxKnowledgeScore=" + maxKnowledgeScore + ", subject=" + subject - + ", useCount=" + useCount + ", dateLastUsed=" + dateLastUsed + "]"; + + ", useCount=" + useCount + ", dateLastUsed=" + dateLastUsed + ", isActive=" + isActive + "]"; } + } diff --git a/src/main/java/com/revature/domain/Subject.java b/src/main/java/com/revature/domain/Subject.java index 9b74459..e5cb731 100644 --- a/src/main/java/com/revature/domain/Subject.java +++ b/src/main/java/com/revature/domain/Subject.java @@ -16,11 +16,15 @@ public class Subject implements Serializable { @Column(name = "s_subject") private String subject; + @Column(name = "s_is_active") + private boolean isActive; + public Subject(){} - public Subject(String subject) { + public Subject(String subject, boolean isActive) { super(); this.subject = subject; + this.isActive=isActive; } public Integer getId() { @@ -39,11 +43,20 @@ public void setSubject(String subject) { this.subject = subject; } + public boolean isActive() { + return isActive; + } + + public void setisActive(boolean isActive) { + this.isActive = isActive; + } + @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + (isActive ? 1231 : 1237); result = prime * result + ((subject == null) ? 0 : subject.hashCode()); return result; } @@ -62,6 +75,8 @@ public boolean equals(Object obj) { return false; } else if (!id.equals(other.id)) return false; + if (isActive != other.isActive) + return false; if (subject == null) { if (other.subject != null) return false; @@ -72,6 +87,7 @@ public boolean equals(Object obj) { @Override public String toString() { - return "Subject [id=" + id + ", subject=" + subject + "]"; + return "Subject [id=" + id + ", subject=" + subject + ", isActive=" + isActive + "]"; } + } diff --git a/src/main/java/com/revature/repositories/PersonRepository.java b/src/main/java/com/revature/repositories/PersonRepository.java index 01e0a3a..4ddf507 100644 --- a/src/main/java/com/revature/repositories/PersonRepository.java +++ b/src/main/java/com/revature/repositories/PersonRepository.java @@ -11,12 +11,14 @@ @Repository public interface PersonRepository extends JpaRepository { - Page findAllByPersonRole(Pageable pageable, PersonRole personrole); - Page findAllByLastNameIgnoreCase(Pageable pageable, String lastName); - Page findAllByFirstNameIgnoreCase(Pageable pageable, String firstName); - Page findAllByFirstNameAndLastNameAllIgnoreCase(Pageable pageable, String firstName, String lastName); - Page findAllByFirstNameIgnoreCaseAndPersonRole(Pageable pageable, String firstName, PersonRole personRole); - Page findAllByLastNameIgnoreCaseAndPersonRole(Pageable pageable, String lastName, PersonRole personRole); - Page findAllByFirstNameIgnoreCaseAndLastNameIgnoreCaseAndPersonRole(Pageable pageable, String firstName, String lastName, PersonRole personRole); - + Person findByIdAndIsActiveTrue(int id); + Page findAllByPersonRoleAndIsActiveTrue(Pageable pageable, PersonRole personrole); + Page findAllByLastNameIgnoreCaseAndIsActiveTrue(Pageable pageable, String lastName); + Page findAllByFirstNameIgnoreCaseAndIsActiveTrue(Pageable pageable, String firstName); + Page findAllByFirstNameAndLastNameAllIgnoreCaseAndIsActiveTrue(Pageable pageable, String firstName, String lastName); + Page findAllByFirstNameIgnoreCaseAndPersonRoleAndIsActiveTrue(Pageable pageable, String firstName, PersonRole personRole); + Page findAllByLastNameIgnoreCaseAndPersonRoleAndIsActiveTrue(Pageable pageable, String lastName, PersonRole personRole); + Page findAllByFirstNameIgnoreCaseAndLastNameIgnoreCaseAndPersonRoleAndIsActiveTrue(Pageable pageable, String firstName, String lastName, PersonRole personRole); + Page findByIsActiveTrue(Pageable pageable); + } diff --git a/src/main/java/com/revature/services/PersonLogic.java b/src/main/java/com/revature/services/PersonLogic.java index 419fb86..0317cb8 100644 --- a/src/main/java/com/revature/services/PersonLogic.java +++ b/src/main/java/com/revature/services/PersonLogic.java @@ -12,7 +12,8 @@ public interface PersonLogic { Person createPerson(Person person); - String deletePerson(int id); + String deletePerson(int id); // for setting isActive=false + String deletePersonAdmin(int id); // for hard delete option Person updatePerson(Person p); Page getAllPersons(Pageable pageable); Page getPersonByFirstName(Pageable pageable, String firstName); diff --git a/src/main/java/com/revature/services/PersonLogicImpl.java b/src/main/java/com/revature/services/PersonLogicImpl.java index 5aa2e9d..9829611 100644 --- a/src/main/java/com/revature/services/PersonLogicImpl.java +++ b/src/main/java/com/revature/services/PersonLogicImpl.java @@ -33,19 +33,19 @@ public class PersonLogicImpl implements PersonLogic { @Override public Page getPersonByFirstName(Pageable pageable, String firstName) { - return dao.findAllByFirstNameIgnoreCase(pageable, firstName); + return dao.findAllByFirstNameIgnoreCaseAndIsActiveTrue(pageable, firstName); } @Override public Page getPersonByLastName(Pageable pageable, String lastName) { - return dao.findAllByLastNameIgnoreCase(pageable, lastName); + return dao.findAllByLastNameIgnoreCaseAndIsActiveTrue(pageable, lastName); } @Override public Person getPersonById(int id) { - Person person = dao.findOne(id); + Person person = dao.findByIdAndIsActiveTrue(id); if (person == null) { throw new NotFoundException("Person with id " + id + " does not exist"); @@ -56,7 +56,7 @@ public Person getPersonById(int id) { @Override public Page getAllPersons(Pageable pageable) { - return dao.findAll(pageable); + return dao.findByIsActiveTrue(pageable); } @Override @@ -82,13 +82,14 @@ public Person updatePerson(Person p) { @Override public String deletePerson(int id) { Person pers = getPersonById(id); - dao.delete(id); + pers.setisActive(false); + dao.saveAndFlush(pers); return "{\"text\":\"Person: " + id + " - DELETED\"}"; } @Override public Page getByFirstNameAndLastName(Pageable pageable, String firstName, String lastName) { - return dao.findAllByFirstNameAndLastNameAllIgnoreCase(pageable, firstName, lastName); + return dao.findAllByFirstNameAndLastNameAllIgnoreCaseAndIsActiveTrue(pageable, firstName, lastName); } @Override @@ -103,19 +104,19 @@ public Person createPerson(Person person) { @Override public Page getAllPersonsByPersonRole(Pageable pageable, PersonRole personRole) { if(personRole==null){ - return dao.findAll(pageable); + return getAllPersons(pageable); } else{ validation.validatePersonRole(personRole); - return dao.findAllByPersonRole(pageable, personRole); + return dao.findAllByPersonRoleAndIsActiveTrue(pageable, personRole); } } @Override public Page getPersonsByFirstnameAndPersonRole(Pageable pageable, String firstname, PersonRole personRole) { if(personRole == null){ - return dao.findAllByFirstNameIgnoreCase(pageable, firstname); + return dao.findAllByFirstNameIgnoreCaseAndIsActiveTrue(pageable, firstname); } else{ - return dao.findAllByFirstNameIgnoreCaseAndPersonRole(pageable, firstname, personRole); + return dao.findAllByFirstNameIgnoreCaseAndPersonRoleAndIsActiveTrue(pageable, firstname, personRole); } } @@ -123,9 +124,9 @@ public Page getPersonsByFirstnameAndPersonRole(Pageable pageable, String @Override public Page getPersonsByLastnameAndPersonRole(Pageable pageable, String lastname, PersonRole personRole) { if(personRole == null){ - return dao.findAllByLastNameIgnoreCase(pageable, lastname); + return dao.findAllByLastNameIgnoreCaseAndIsActiveTrue(pageable, lastname); }else{ - return dao.findAllByLastNameIgnoreCaseAndPersonRole(pageable, lastname, personRole); + return dao.findAllByLastNameIgnoreCaseAndPersonRoleAndIsActiveTrue(pageable, lastname, personRole); } } @@ -133,10 +134,23 @@ public Page getPersonsByLastnameAndPersonRole(Pageable pageable, String public Page getPersonsByFirstnameAndLastnameAndPersonRole(Pageable pageable, String firstname, String lastname, PersonRole personRole) { if(personRole == null){ - return dao.findAllByFirstNameAndLastNameAllIgnoreCase(pageable, firstname, lastname); + return dao.findAllByFirstNameAndLastNameAllIgnoreCaseAndIsActiveTrue(pageable, firstname, lastname); } else{ - return dao.findAllByFirstNameIgnoreCaseAndLastNameIgnoreCaseAndPersonRole(pageable, firstname, lastname, personRole); + return dao.findAllByFirstNameIgnoreCaseAndLastNameIgnoreCaseAndPersonRoleAndIsActiveTrue(pageable, firstname, lastname, personRole); + } + } + + + // For Admin Use to hard delete + @Override + public String deletePersonAdmin(int id) { + Person pers = dao.findOne(id); + if (pers==null){ + throw new NotFoundException("Person with id " + id + " does not exist"); } + dao.delete(id); + return "{\"text\":\"Person: name: " + pers.getFirstName()+ " " + pers.getLastName()+ " id: " + id + " - FULLY DELETED\"}"; } + }