From 16c35e981fee419b25ff011f5a1da629552b9771 Mon Sep 17 00:00:00 2001 From: eyalvo-matrix Date: Sun, 24 Dec 2017 13:45:22 +0200 Subject: [PATCH] Therapy groups fixes (#1326) --- interface/forms/group_attendance/new.php | 4 +--- interface/forms/group_attendance/report.php | 2 +- interface/forms/group_attendance/save.php | 10 +++++----- interface/forms/group_attendance/table.sql | 2 +- interface/forms/newGroupEncounter/common.php | 1 + sql/5_0_0-to-5_0_1_upgrade.sql | 11 ++++++++--- sql/database.sql | 2 +- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/interface/forms/group_attendance/new.php b/interface/forms/group_attendance/new.php index f7f8ca055..75eecbdfb 100644 --- a/interface/forms/group_attendance/new.php +++ b/interface/forms/group_attendance/new.php @@ -260,9 +260,7 @@ if ($form_id) {//If editing a form or the form already exists (inwhich case will /* Form elements */ $('.cancel').click(function () { top.restoreSession(); - var srcdir = ""; - var url = srcdir + "/patient_file/encounter/encounter_top.php"; - window.location = url; + parent.closeTab(window.name, false); }); diff --git a/interface/forms/group_attendance/report.php b/interface/forms/group_attendance/report.php index 7efc43e69..86aef8e2b 100644 --- a/interface/forms/group_attendance/report.php +++ b/interface/forms/group_attendance/report.php @@ -36,7 +36,7 @@ function group_attendance_report($pid, $encounter, $cols, $id) global $therapy_group; - $sql = "SELECT * FROM `form_therapy_groups_attendance` WHERE id=? AND group_id = ? AND encounter_id = ?"; + $sql = "SELECT * FROM `form_group_attendance` WHERE id=? AND group_id = ? AND encounter_id = ?"; $res = sqlStatement($sql, array($id,$therapy_group, $_SESSION["encounter"])); $form_data = sqlFetchArray($res); $group_data = getGroup($therapy_group); diff --git a/interface/forms/group_attendance/save.php b/interface/forms/group_attendance/save.php index 27c90dad2..d7a39cf51 100644 --- a/interface/forms/group_attendance/save.php +++ b/interface/forms/group_attendance/save.php @@ -42,13 +42,13 @@ $group_encounter_data = get_group_encounter_data($encounter); //If saving new form if ($_GET['mode'] == 'new') { //Get the number that should be the new form's id - $newid = largest_id_plus_one('form_therapy_groups_attendance'); + $newid = largest_id_plus_one('form_group_attendance'); //Insert into 'forms' table addForm($encounter, "Group Attendance Form", $newid, "group_attendance", null, $userauthorized); - //Insert into form_therapy_groups_attendance table - $sql_for_table_ftga = "INSERT INTO form_therapy_groups_attendance (id, date, group_id, user, groupname, authorized, encounter_id, activity) " . + //Insert into form_group_attendance table + $sql_for_table_ftga = "INSERT INTO form_group_attendance (id, date, group_id, user, groupname, authorized, encounter_id, activity) " . "VALUES(?,NOW(),?,?,?,?,?,?);"; $sqlBindArray = array(); array_push($sqlBindArray, $newid, $therapy_group, $_SESSION["authUser"], $_SESSION["authProvider"], $userauthorized, $encounter, '1'); @@ -60,13 +60,13 @@ if ($_GET['mode'] == 'new') { elseif ($_GET['mode'] == 'update') { //Update form_therapy_groups_attendance table $id = $_GET['id']; - $sql_for_form_tga = "UPDATE form_therapy_groups_attendance SET date = NOW(), user = ?, groupname = ?, authorized = ? WHERE id = ?;"; + $sql_for_form_tga = "UPDATE form_group_attendance SET date = NOW(), user = ?, groupname = ?, authorized = ? WHERE id = ?;"; $sqlBindArray = array(); array_push($sqlBindArray, $_SESSION["authUser"], $_SESSION["authProvider"], $userauthorized, $id); sqlInsert($sql_for_form_tga, $sqlBindArray); //Delete from therapy_groups_participant_attendance table - $sql_delete_from_table_tgpa = "DELETE FROM therapy_groups_participant_attendance WHERE form_id = ?;"; + $sql_delete_from_table_tgpa = "DELETE FROM form_group_attendance WHERE form_id = ?;"; sqlStatement($sql_delete_from_table_tgpa, array($id)); //Database insertions for participants diff --git a/interface/forms/group_attendance/table.sql b/interface/forms/group_attendance/table.sql index 693e7e31a..1f12d6a2f 100644 --- a/interface/forms/group_attendance/table.sql +++ b/interface/forms/group_attendance/table.sql @@ -1,4 +1,4 @@ -CREATE TABLE IF NOT EXISTS `form_therapy_groups_attendance` ( +CREATE TABLE IF NOT EXISTS `form_group_attendance` ( `id` bigint(20) NOT NULL auto_increment, `date` date NOT NULL , `group_id` int(11), diff --git a/interface/forms/newGroupEncounter/common.php b/interface/forms/newGroupEncounter/common.php index 13df8dd13..f9a612036 100644 --- a/interface/forms/newGroupEncounter/common.php +++ b/interface/forms/newGroupEncounter/common.php @@ -13,6 +13,7 @@ */ require_once("$srcdir/options.inc.php"); +require_once("$srcdir/api.inc"); require_once("$srcdir/group.inc"); require_once("$srcdir/classes/POSRef.class.php"); diff --git a/sql/5_0_0-to-5_0_1_upgrade.sql b/sql/5_0_0-to-5_0_1_upgrade.sql index b75fbcb1b..eb7df04c1 100644 --- a/sql/5_0_0-to-5_0_1_upgrade.sql +++ b/sql/5_0_0-to-5_0_1_upgrade.sql @@ -255,8 +255,12 @@ INSERT INTO registry (name, state, directory, sql_run, unpackaged, date, priorit INSERT INTO registry (name, state, directory, sql_run, unpackaged, date, priority, category, nickname, patient_encounter, therapy_group_encounter) VALUES ('New Group Encounter Form', 1, 'newGroupEncounter', 1, 1, '2015-10-15 00:00:00', 0, 'Clinical', '',0,1); #EndIf -#IfNotTable form_therapy_groups_attendance -CREATE TABLE `form_therapy_groups_attendance` ( +#IfTable form_therapy_groups_attendance +RENAME TABLE form_therapy_groups_attendance TO form_group_attendance; +#EndIf + +#IfNotTable form_group_attendance +CREATE TABLE `form_group_attendance` ( id bigint(20) auto_increment, date date, group_id int(11), @@ -669,4 +673,5 @@ UPDATE `openemr_postcalendar_categories` SET pc_constant_id = LOWER(REPLACE (pc_ #IfMissingColumn facility facility_taxonomy ALTER TABLE facility ADD facility_taxonomy VARCHAR(15) DEFAULT NULL; -#EndIf \ No newline at end of file +#EndIf + diff --git a/sql/database.sql b/sql/database.sql index d607cc4c1..0d1a70316 100644 --- a/sql/database.sql +++ b/sql/database.sql @@ -10741,7 +10741,7 @@ CREATE TABLE `form_groups_encounter` ( -- DROP TABLE IF EXISTS `form_therapy_groups_attendance`; -CREATE TABLE `form_therapy_groups_attendance` ( +CREATE TABLE `form_group_attendance` ( `id` bigint(20) auto_increment, `date` date, `group_id` int(11), -- 2.11.4.GIT