diff --git a/create_databases/iqc_db/update_iqc_1.1.0_1.2.0.sql b/create_databases/iqc_db/update_iqc_1.1.0_1.2.0.sql new file mode 100644 index 0000000..fadee56 --- /dev/null +++ b/create_databases/iqc_db/update_iqc_1.1.0_1.2.0.sql @@ -0,0 +1,7 @@ + +-- kolom prefmodality toevoegen aan users tabel +ALTER TABLE `users` ADD `prefmodality` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL AFTER `email`; + +-- database versie +UPDATE config SET value='1.2.0',date_modified='2017-01-30' WHERE property='Version_Database'; + diff --git a/create_databases/update_iqc_1.0.0_1.1.0.sh b/create_databases/update_iqc_1.0.0_1.1.0.sh index 4e6a8d5..7380d8a 100644 --- a/create_databases/update_iqc_1.0.0_1.1.0.sh +++ b/create_databases/update_iqc_1.0.0_1.1.0.sh @@ -9,8 +9,7 @@ echo mysql -uroot iqc -p$1 < iqc_db/update_iqc_1.0.0_1.1.0.sql -echo. +echo echo Done... -echo. +echo -pause diff --git a/create_databases/update_iqc_1.1.0_1.2.0.cmd b/create_databases/update_iqc_1.1.0_1.2.0.cmd new file mode 100644 index 0000000..fddf366 --- /dev/null +++ b/create_databases/update_iqc_1.1.0_1.2.0.cmd @@ -0,0 +1,18 @@ +@echo off + +set MYSQL=c:\xampp\mysql\bin\mysql.exe +rem set MYSQL=C:\wamp\bin\mysql\mysql5.5.20\bin\mysql.exe +set ROOTPWD= + +echo. +echo Kolom "prefmodality" toevoegen aan tabel users +echo. + +%MYSQL% -uroot iqc -p%ROOTPWD% < iqc_db\update_iqc_1.1.0_1.2.0.sql + +echo. +echo Done... +echo. + +pause + diff --git a/create_databases/update_iqc_1.1.0_1.2.0.sh b/create_databases/update_iqc_1.1.0_1.2.0.sh new file mode 100644 index 0000000..b480fea --- /dev/null +++ b/create_databases/update_iqc_1.1.0_1.2.0.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +# optional first argument = mysql root password + +echo +echo - Kolom "prefmodality" toevoegen aan tabel users +echo + +mysql -uroot iqc -p$1 < iqc_db/update_iqc_1.1.0_1.2.0.sql + +echo +echo Done... +echo + diff --git a/website/WAD-IQC/database/globals.php b/website/WAD-IQC/database/globals.php index 3f12cbb..dfb248c 100644 --- a/website/WAD-IQC/database/globals.php +++ b/website/WAD-IQC/database/globals.php @@ -87,7 +87,7 @@ $databaseName_dcm4chee = "pacsdb"; // Version of WAD_Interface -$version = "1.1.0"; +$version = "1.2.0"; diff --git a/website/WAD-IQC/database/iqc/create_users.php b/website/WAD-IQC/database/iqc/create_users.php index 7302992..2a4492e 100644 --- a/website/WAD-IQC/database/iqc/create_users.php +++ b/website/WAD-IQC/database/iqc/create_users.php @@ -64,6 +64,7 @@ $table_data->assign("initials",$field_users->initials); $table_data->assign("phone",$field_users->phone); $table_data->assign("email",$field_users->email); + $table_data->assign("prefmodality",$field_users->prefmodality); $table_data->assign("action",$action); if (!empty($user_level_1)) diff --git a/website/WAD-IQC/database/iqc/menu_structure.php b/website/WAD-IQC/database/iqc/menu_structure.php index e0dc036..3882f43 100644 --- a/website/WAD-IQC/database/iqc/menu_structure.php +++ b/website/WAD-IQC/database/iqc/menu_structure.php @@ -68,7 +68,7 @@ $level['Results']['Selector']=1; -$level['Results']['Dashboard']=1; +$level['Results']['Dashboard']=2; $action['Results']['Selector']='../iqc/show_selector.php'; $action['Results']['Dashboard']='../iqc/show_dashboard.php'; diff --git a/website/WAD-IQC/database/iqc/new_users.php b/website/WAD-IQC/database/iqc/new_users.php index 38ffc2f..91ed665 100644 --- a/website/WAD-IQC/database/iqc/new_users.php +++ b/website/WAD-IQC/database/iqc/new_users.php @@ -60,6 +60,7 @@ $users_initials=$_POST['users_initials']; $users_phone=$_POST['users_phone']; $users_email=$_POST['users_email']; + $users_preferred_modality=$_POST['users_preferred_modality']; //priveleges $message2=''; @@ -146,9 +147,9 @@ exit(); } - $addStmt = "Insert into $table_users(firstname,lastname,initials,phone,email,login_level_1,login_level_2,login_level_3,login_level_4,login_level_5,login,password) values ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')"; + $addStmt = "Insert into $table_users(firstname,lastname,initials,phone,email,prefmodality,login_level_1,login_level_2,login_level_3,login_level_4,login_level_5,login,password) values ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')"; - $addStmt=sprintf($addStmt,$users_firstname,$users_lastname,$users_initials,$users_phone,$users_email,$login_level_1,$login_level_2,$login_level_3,$login_level_4,$login_level_5,$users_login,md5($first_login)); + $addStmt=sprintf($addStmt,$users_firstname,$users_lastname,$users_initials,$users_phone,$users_email,$users_preferred_modality,$login_level_1,$login_level_2,$login_level_3,$login_level_4,$login_level_5,$users_login,md5($first_login)); if (!($link->query($addStmt))) { @@ -168,8 +169,8 @@ $table_users='users'; - $updateStmt = "Update $table_users set firstname='%s',lastname='%s',initials='%s',phone='%s',email='%s',login_level_1='%s',login_level_2='%s',login_level_3='%s',login_level_4='%s',login_level_5='%s',login='%s' where $table_users.pk='%d'"; - $updateStmt=sprintf($updateStmt,$users_firstname,$users_lastname,$users_initials,$users_phone,$users_email,$login_level_1,$login_level_2,$login_level_3,$login_level_4,$login_level_5,$users_login,$users_pk); + $updateStmt = "Update $table_users set firstname='%s',lastname='%s',initials='%s',phone='%s',email='%s',prefmodality='%s',login_level_1='%s',login_level_2='%s',login_level_3='%s',login_level_4='%s',login_level_5='%s',login='%s' where $table_users.pk='%d'"; + $updateStmt=sprintf($updateStmt,$users_firstname,$users_lastname,$users_initials,$users_phone,$users_email,$users_preferred_modality,$login_level_1,$login_level_2,$login_level_3,$login_level_4,$login_level_5,$users_login,$users_pk); if (!($link->query($updateStmt))) { @@ -229,6 +230,7 @@ $users->assign("default_users_lastname",$field_users->lastname); $users->assign("default_users_phone",$field_users->phone); $users->assign("default_users_email",$field_users->email); + $users->assign("default_users_preferred_modality",$field_users->prefmodality); $users->assign("default_users_initials",$field_users->initials); $users->assign("default_users_login",$field_users->login); $checked1=''; diff --git a/website/WAD-IQC/database/iqc/view_users.php b/website/WAD-IQC/database/iqc/view_users.php index 7934941..b313f4d 100644 --- a/website/WAD-IQC/database/iqc/view_users.php +++ b/website/WAD-IQC/database/iqc/view_users.php @@ -44,6 +44,7 @@ $users->assign("default_users_lastname",$field_users->lastname); $users->assign("default_users_phone",$field_users->phone); $users->assign("default_users_email",$field_users->email); + $users->assign("default_users_preferred_modality",$field_users->prefmodality); $users->assign("default_users_initials",$field_users->initials); $users->assign("default_users_login",$field_users->login); $checked1=''; diff --git a/website/WAD-IQC/database/login/login_verify.php b/website/WAD-IQC/database/login/login_verify.php index fd7000e..94ea9a1 100644 --- a/website/WAD-IQC/database/login/login_verify.php +++ b/website/WAD-IQC/database/login/login_verify.php @@ -80,13 +80,16 @@ // JK - by default choose results --> selector instead of nothing //$selected_top='100'; //$selected_bottom='100'; + // Select results - dashboard at login $selected_top='1'; - $selected_bottom='1'; + $selected_bottom='2'; + $preferred_modality=$pw_field->prefmodality; // JK: change default behaviour: display results / selector table by default //$bottom_frame=sprintf("../iqc/frontpage-bottom.html"); - $bottom_frame=sprintf("../iqc/show_selector.php"); + //$bottom_frame=sprintf("../iqc/show_selector.php"); + $bottom_frame=sprintf("../iqc/show_dashboard.php?modaliteit=$preferred_modality"); $executestring.= sprintf("../main/main_iqc.php?top_menu=$top_menu&bottom_menu=$bottom_menu&selected_top=$selected_top&selected_bottom=$selected_bottom&bottom_frame=$bottom_frame&t=%d",time()); header($executestring); exit(); diff --git a/website/WAD-Smarty_dir/templates/new_users.tpl b/website/WAD-Smarty_dir/templates/new_users.tpl index ae676e4..d910adb 100644 --- a/website/WAD-Smarty_dir/templates/new_users.tpl +++ b/website/WAD-Smarty_dir/templates/new_users.tpl @@ -48,6 +48,12 @@ + + Preferred Modality + + + + diff --git a/website/WAD-Smarty_dir/templates/users_select_header.tpl b/website/WAD-Smarty_dir/templates/users_select_header.tpl index e436c43..d0739c0 100644 --- a/website/WAD-Smarty_dir/templates/users_select_header.tpl +++ b/website/WAD-Smarty_dir/templates/users_select_header.tpl @@ -7,4 +7,5 @@ Initialen   Telefoon   E-mail   + Voorkeursmodaliteit   diff --git a/website/WAD-Smarty_dir/templates/users_select_row.tpl b/website/WAD-Smarty_dir/templates/users_select_row.tpl index 2975ad1..3f78aec 100644 --- a/website/WAD-Smarty_dir/templates/users_select_row.tpl +++ b/website/WAD-Smarty_dir/templates/users_select_row.tpl @@ -21,4 +21,7 @@ {$email} + + {$prefmodality} + diff --git a/website/WAD-Smarty_dir/templates/view_users.tpl b/website/WAD-Smarty_dir/templates/view_users.tpl index 5dfd2d2..b60e4c0 100644 --- a/website/WAD-Smarty_dir/templates/view_users.tpl +++ b/website/WAD-Smarty_dir/templates/view_users.tpl @@ -33,6 +33,10 @@ Email {$default_users_email} + + Preferred Modality + {$default_users_preferred_modality} +
diff --git a/website/WAD-Smarty_dir/templates/view_users_select.tpl b/website/WAD-Smarty_dir/templates/view_users_select.tpl index 20bc471..8664487 100644 --- a/website/WAD-Smarty_dir/templates/view_users_select.tpl +++ b/website/WAD-Smarty_dir/templates/view_users_select.tpl @@ -35,6 +35,10 @@ Email {$default_users_email} + + Preferred Modality + {$default_users_preferred_modality} +