diff --git a/SQL/0000-00-00-schema.sql b/SQL/0000-00-00-schema.sql index 19fb5836987..31e285b2ebc 100644 --- a/SQL/0000-00-00-schema.sql +++ b/SQL/0000-00-00-schema.sql @@ -2571,7 +2571,7 @@ CREATE TABLE `publication_users_edit_perm_rel` ( CONSTRAINT `FK_publication_users_edit_perm_rel_UserID` FOREIGN KEY (`UserID`) REFERENCES `users` (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET='utf8'; -CREATE TABLE login_summary_statistics ( +CREATE TABLE Login_Summary_Statistics ( Title VARCHAR(255), Project VARCHAR(255), Value INT, diff --git a/SQL/9999-99-99-drop_tables.sql b/SQL/9999-99-99-drop_tables.sql index 528474db560..da54df889f2 100644 --- a/SQL/9999-99-99-drop_tables.sql +++ b/SQL/9999-99-99-drop_tables.sql @@ -149,7 +149,7 @@ DROP TABLE IF EXISTS `publication`; DROP TABLE IF EXISTS `publication_status`; DROP TABLE IF EXISTS `publication_collaborator`; -DROP TABLE IF EXISTS `login_summary_statistics`; +DROP TABLE IF EXISTS `Login_Summary_Statistics`; DROP TABLE IF EXISTS `parameter_session`; DROP TABLE IF EXISTS `parameter_file`; diff --git a/modules/login/php/summary_statistics.class.inc b/modules/login/php/summary_statistics.class.inc index ba9f5f2415d..87cdcbd441b 100644 --- a/modules/login/php/summary_statistics.class.inc +++ b/modules/login/php/summary_statistics.class.inc @@ -31,7 +31,7 @@ class Summary_Statistics extends \NDB_Page implements ETagCalculator case 'GET': $DB = $this->loris->getDatabaseConnection(); $response = $DB->pselect( - "SELECT * FROM login_summary_statistics + "SELECT * FROM Login_Summary_Statistics WHERE Value > 0 ORDER BY QueryOrder ASC", [], @@ -40,7 +40,7 @@ class Summary_Statistics extends \NDB_Page implements ETagCalculator return new \LORIS\Http\Response\JsonResponse(null); } $projects = $DB->pselectCol( - "SELECT DISTINCT Project FROM login_summary_statistics", + "SELECT DISTINCT Project FROM Login_Summary_Statistics", [] ); diff --git a/raisinbread/RB_files/RB_login_summary_statistics.sql b/raisinbread/RB_files/RB_login_summary_statistics.sql index 9d70d4f0516..b75caabe249 100644 --- a/raisinbread/RB_files/RB_login_summary_statistics.sql +++ b/raisinbread/RB_files/RB_login_summary_statistics.sql @@ -1,31 +1,31 @@ SET FOREIGN_KEY_CHECKS=0; -TRUNCATE TABLE `login_summary_statistics`; -LOCK TABLES `login_summary_statistics` WRITE; -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('EEG Recording','All Projects',10,7); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('EEG Recording','Pumpernickel',10,7); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','All Projects',334,1); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Challah',47,1); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Pumpernickel',225,1); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Rye',62,1); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','All Projects',5,5); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Challah',5,5); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Pumpernickel',5,5); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Rye',2,5); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','All Projects',328,2); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Challah',60,2); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Pumpernickel',210,2); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Rye',58,2); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','All Projects',311,6); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Challah',23,6); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Pumpernickel',247,6); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Rye',41,6); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','All Projects',4,3); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Challah',1,3); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Pumpernickel',4,3); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Rye',1,3); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','All Projects',1133,4); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Challah',147,4); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Pumpernickel',855,4); -INSERT INTO `login_summary_statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Rye',131,4); +TRUNCATE TABLE `Login_Summary_Statistics`; +LOCK TABLES `Login_Summary_Statistics` WRITE; +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('EEG Recording','All Projects',10,7); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('EEG Recording','Pumpernickel',10,7); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','All Projects',334,1); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Challah',47,1); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Pumpernickel',225,1); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Female Participant','Rye',62,1); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','All Projects',5,5); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Challah',5,5); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Pumpernickel',5,5); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Instrument','Rye',2,5); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','All Projects',328,2); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Challah',60,2); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Pumpernickel',210,2); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Male Participant','Rye',58,2); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','All Projects',311,6); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Challah',23,6); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Pumpernickel',247,6); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Scan','Rye',41,6); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','All Projects',4,3); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Challah',1,3); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Pumpernickel',4,3); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Site','Rye',1,3); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','All Projects',1133,4); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Challah',147,4); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Pumpernickel',855,4); +INSERT INTO `Login_Summary_Statistics` (`Title`, `Project`, `Value`, `QueryOrder`) VALUES ('Visit','Rye',131,4); UNLOCK TABLES; SET FOREIGN_KEY_CHECKS=1; diff --git a/tools/update_login_summary_statistics.php b/tools/update_login_summary_statistics.php index ae51aab0844..e8afbfbb3c8 100644 --- a/tools/update_login_summary_statistics.php +++ b/tools/update_login_summary_statistics.php @@ -66,7 +66,7 @@ ); $user = (new \User())->factory('admin'); $data = ['All Projects' => []]; -$DB->run("DELETE FROM login_summary_statistics", []); +$DB->run("DELETE FROM Login_Summary_Statistics", []); foreach ($projects as $project) { $data[$project] = []; } @@ -155,7 +155,7 @@ foreach ($data as $project => $values) { foreach ($values as $title => $value) { $DB->insertOnDuplicateUpdate( - 'login_summary_statistics', + 'Login_Summary_Statistics', [ 'Project' => $project, 'Title' => $title,