Skip to content

Dashboard user pref #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wadqc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Dashboard user pref #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85246e9
Add "user preferred modality" to dashboard:
wadqc Jan 30, 2017
1d585c1
Minor bugfix for technician users with menu selection.
wadqc Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions create_databases/iqc_db/update_iqc_1.1.0_1.2.0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

5 changes: 2 additions & 3 deletions create_databases/update_iqc_1.0.0_1.1.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 18 additions & 0 deletions create_databases/update_iqc_1.1.0_1.2.0.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

14 changes: 14 additions & 0 deletions create_databases/update_iqc_1.1.0_1.2.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion website/WAD-IQC/database/globals.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
$databaseName_dcm4chee = "pacsdb";

// Version of WAD_Interface
$version = "1.1.0";
$version = "1.2.0";



Expand Down
1 change: 1 addition & 0 deletions website/WAD-IQC/database/iqc/create_users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion website/WAD-IQC/database/iqc/menu_structure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
10 changes: 6 additions & 4 deletions website/WAD-IQC/database/iqc/new_users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='';
Expand Down Expand Up @@ -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)))
{
Expand All @@ -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)))
{
Expand Down Expand Up @@ -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='';
Expand Down
1 change: 1 addition & 0 deletions website/WAD-IQC/database/iqc/view_users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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='';
Expand Down
7 changes: 5 additions & 2 deletions website/WAD-IQC/database/login/login_verify.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 6 additions & 0 deletions website/WAD-Smarty_dir/templates/new_users.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
<input name="users_email" type="text" value="{$default_users_email}" size="30"> </input>
</td>
</tr>
<tr>
<td class="table_data_blue"> Preferred Modality </td>
<td class="table_data">
<input name="users_preferred_modality" type="text" value="{$default_users_preferred_modality}" size="30"> </input>
</td>
</tr>



Expand Down
1 change: 1 addition & 0 deletions website/WAD-Smarty_dir/templates/users_select_header.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
<td class="table_data_header_bold">Initialen&nbsp;&nbsp;</td>
<td class="table_data_header_bold">Telefoon&nbsp;&nbsp;</td>
<td class="table_data_header_bold">E-mail&nbsp;&nbsp;</td>
<td class="table_data_header_bold">Voorkeursmodaliteit&nbsp;&nbsp;</td>
</tr>
3 changes: 3 additions & 0 deletions website/WAD-Smarty_dir/templates/users_select_row.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@
<td class="table_data">
{$email}
</td>
<td class="table_data">
{$prefmodality}
</td>
</tr>
4 changes: 4 additions & 0 deletions website/WAD-Smarty_dir/templates/view_users.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
<td class="table_data_blue"> Email </td>
<td class="table_data"> {$default_users_email} </td>
</tr>
<tr>
<td class="table_data_blue"> Preferred Modality </td>
<td class="table_data"> {$default_users_preferred_modality} </td>
</tr>
</table>

<hr>
Expand Down
4 changes: 4 additions & 0 deletions website/WAD-Smarty_dir/templates/view_users_select.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
<td class="table_data_blue"> Email </td>
<td class="table_data"> {$default_users_email} </td>
</tr>
<tr>
<td class="table_data_blue"> Preferred Modality </td>
<td class="table_data"> {$default_users_preferred_modality} </td>
</tr>
</table>

<hr>
Expand Down