diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index cd5fed54f..0c8f5c155 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -18,6 +18,7 @@ to the database link properties. (Martin Kamerbeek / Procolix) - Converted config file format from PlainConfig to JSON. The new format is more powerful and will use slightly less memory. + - fix [ 1406210 ] 6.9 i18n in create.sql, previous.sql broken. 6.8.6 - Added logic to deal with case sensitivity and whitespace problems in LDAP @@ -26,6 +27,7 @@ - fix [ 1328895 ] Page Redirect Asset Help File needs to be changed - fix [ 1423815 ] snippet v6.8.5 - fix [ 1421056 ] LDAP Recursive Property Bug + - fix [ 1404350 ] no hoverHelp for InOutBoard 6.8.5 - fix [ 1396957 ] Insufficient privileges check on the DataForm diff --git a/lib/WebGUI/Asset/Wobject/InOutBoard.pm b/lib/WebGUI/Asset/Wobject/InOutBoard.pm index 583ae052a..d5c517a7f 100644 --- a/lib/WebGUI/Asset/Wobject/InOutBoard.pm +++ b/lib/WebGUI/Asset/Wobject/InOutBoard.pm @@ -207,6 +207,7 @@ sub view { -options=>\%nameHash, -value=>[ $self->session->scratch->get("userId") ], -label=>$i18n->get('delegate'), + -hoverHelp=>$i18n->get('delegate description'), -extras=>q|onchange="this.form.submit();"|, ); } @@ -215,10 +216,12 @@ sub view { -value=>$status, -options=>$statusListHashRef, -label=>$i18n->get(5) + -hoverHelp=>$i18n->get('5 description') ); $f->text( -name=>"message", -label=>$i18n->get(6) + -hoverHelp=>$i18n->get('6 description') ); $f->hidden( -name=>"func", @@ -294,6 +297,7 @@ order by department, lastName, firstName"; sub www_edit { my $self = shift; return $self->session->privilege->insufficient() unless $self->canEdit; + $self->getAdminConsole->setHelp("in out board add/edit","Asset_InOurBoard"); my $i18n = WebGUI::International->new($self->session, "Asset_InOutBoard"); return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get("18")); } @@ -343,6 +347,7 @@ group by userId", $self->session->db->quote($self->getId), $self->session->db->q $f->selectList( -name => "delegates", -label => $i18n->get('in/out status delegates'), + -hoverHelp => $i18n->get('in/out status delegates description','Asset_InOutBoard'), -options => \%userNames, -multiple => 1, ##Multiple select -size => 10, ##Multiple select @@ -419,12 +424,14 @@ sub www_viewReport { $f->date( -name=>"startDate", -label=>$i18n->get(16), + -hoverHelp=>$i18n->get('16 description'), -value=>$startDate ); my $endDate = $self->session->form->date("endDate"); $f->date( -name=>"endDate", -label=>$i18n->get(17), + -hoverHelp=>$i18n->get('17 description'), -value=>$endDate ); my %depHash; @@ -440,6 +447,7 @@ sub www_viewReport { -options=>\%depHash, -value=>[ $defaultDepartment ], -label=>$i18n->get('filter departments'), + -label=>$i18n->get('filter departments description'), ); my %paginHash; tie %paginHash, "Tie::IxHash"; ##Because default sort order is alpha @@ -450,6 +458,7 @@ sub www_viewReport { -options=>\%paginHash, -value=>[ $pageReportAfter ], -label=>$i18n->get(14), + -hoverHelp=>$i18n->get('14 description'), ); $f->submit(-value=>"Search"); $var{'form'} = $f->print; diff --git a/lib/WebGUI/Help/Asset_InOutBoard.pm b/lib/WebGUI/Help/Asset_InOutBoard.pm index 0e95d0a0a..501eb1ce0 100644 --- a/lib/WebGUI/Help/Asset_InOutBoard.pm +++ b/lib/WebGUI/Help/Asset_InOutBoard.pm @@ -38,7 +38,11 @@ our $HELP = { ], related => [ { - tag => '2', + tag => 'in out board template', + namespace => 'Asset_InOutBoard' + }, + { + tag => 'in out board report template', namespace => 'Asset_InOutBoard' }, { @@ -51,7 +55,7 @@ our $HELP = { } ] }, - '2' => { + 'in out board template' => { title => '20', body => '21', related => [ @@ -69,7 +73,7 @@ our $HELP = { } ] }, - '3' => { + 'in out board report template' => { title => '22', body => '23', related => [ @@ -77,10 +81,6 @@ our $HELP = { tag => 'in out board add/edit', namespace => 'Asset_InOutBoard' }, - { - tag => '2', - namespace => 'Asset_InOutBoard' - }, { tag => 'template language', namespace => 'Asset_Template' diff --git a/lib/WebGUI/i18n/English/Asset_InOutBoard.pm b/lib/WebGUI/i18n/English/Asset_InOutBoard.pm index 5ab9bd665..84f7f2801 100644 --- a/lib/WebGUI/i18n/English/Asset_InOutBoard.pm +++ b/lib/WebGUI/i18n/English/Asset_InOutBoard.pm @@ -26,12 +26,69 @@ our $I18N = { lastUpdated =>1122010599 }, - '23' => { - message => q| The following variables are made available from In/Out Board Report: -

showReport
A boolean indicating whether or not the rows_loop variable will be set.

form
A variable that contains the HTML for displaying the Date Range Selector Form for the report. 

rows_loop
A loop containing the rows of data for the In/Out Board Report 

-

deptHasChanged
A boolean value indicating whether or not this row of data is for a department that is differnet than the previous rows

username
A variable that returns the users name. If the first and last name fields are defined in the user profile, that is what is returned. Otherwise, the users WebGUI username is returned. i.e., "John Doe" vs "Jdoe"

status
A variable that returns the users status. The status of a user is defined by the Status List in the Wobject Properties. If no status is set for the current user 'Never Checked In' is returned.

dateStamp
A variable that returns the date the status of the user was last updated.

message
A variable that returns what the user entered in the "What's going on?" field when updating their status.

paginateBar
A variable that returns the HTML necessary to create a Traditional Pagination Bar. i.e., << First, 1, 2, Last >>

|, + 'in/out status delegates description' => { + message => q|Use this form to choose others who can change your status on the In/Out Board. All users + who you have already chosen to change your status will be preselected. To remove a user, deselect them.|, + lastUpdated =>1139260288 + }, - lastUpdated =>1091624565 + '23' => { + message => q|

The following variables are available from In/Out Board Report template:

+ +

showReport
+A boolean indicating whether or not the rows_loop variable will be set.

+ +

form
+A variable that contains an HTML form for limiting the scope, by date or department, of the report. + +

username.label
+Internationalized label for the "Username" column of the report. + +

status.label
+Internationalized label for the "Status" column of the report. + +

date.label
+Internationalized label for the "Date" column of the report. + +

message.label
+Internationalized label for the "Message" column of the report. + +

updatedBy.label
+Internationalized label for the "Updated By" column of the report. + +

rows_loop
+A loop containing the rows of data for the In/Out Board Report 

+ +
+ +

deptHasChanged
+A boolean value indicating whether or not this row of data is for a department that is differnet than the previous rows

+ +

username
+A variable that returns the user's name. If the first and last name fields are defined in the user profile, that is what is returned. Otherwise, the users WebGUI username is returned. i.e., "John Doe" vs "Jdoe".

+ +

department
+A variable that returns the user's department. If no department has been assigned to this user, an internationalized label for "No Department" will be used.

+ +

status
+A variable that returns the user's status. The status of a user is defined by the Status List in the Wobject Properties. If no status is set for the current user 'Never Checked In' is returned.

+ +

dateStamp
+A variable that returns the date the status of the user was last updated.

+ +

message
+A variable that returns what the user entered in the "What's going on?" field when updating their status.

+ +

createdBy
+A variable that returns which user, either the user himself or a delegate, changed the status for this user. + +

+ +

paginateBar
+A variable that returns the HTML necessary to create a Traditional Pagination Bar. i.e., << First, 1, 2, Last >>

+|, + + lastUpdated =>1139264476 }, '1 description' => { @@ -60,7 +117,7 @@ our $I18N = { }, 'inOutGroup description' => { - message => q|Whichs groups are allowed to use this In/Out Board to change their status?|, + message => q|Which groups are allowed to use this In/Out Board to change their status?|, lastUpdated => 1138988640, }, @@ -69,10 +126,15 @@ our $I18N = { An In/Out board is used to keep track of whether people are currently in/out of the office. It shows the current In/Out status of all WebGUI users and also logs the reason the person has left, the time they -left and the time they return. The log -

+left and the time they return. The log is viewable in two forms. The first +is a summary of the current status for all users in the groups configured for +this In/Out board instance. The second is a complete report of the history of +all status changes for those users. This report can be setup to have restricted +viewing privileges and is templatable.

+

Users of the In/Out Board can select other users, called delegates, to update +their status for them.

|, - lastUpdated =>1091624565 + lastUpdated =>1139255107 }, '20' => { @@ -96,7 +158,7 @@ can alter their status.

A boolean indicating whether or not the form variable will be set.

form
-A variable that contains the HTML for displaying the In/Out Entry Form.

+A variable that contains the HTML for displaying the In/Out Entry Form to update status for the current user or another user.

rows_loop
A loop containing the rows of data for the In/Out Board

@@ -118,11 +180,12 @@ A variable that returns the date the status of the user was last updated.

message
A variable that returns what the user entered in the "What's going on?" field when updating their status.

+

paginateBar
A variable that returns the HTML necessary to create a Traditional Pagination Bar. i.e., >> First, 1, 2, Last <<

|, - lastUpdated =>1122523725 + lastUpdated =>1139254657 }, '2' => { @@ -140,11 +203,21 @@ A variable that returns the HTML necessary to create a Traditional Pagination Ba lastUpdated =>1091624565 }, + '17 description' => { + message => q|Like the Start Date, End Date can help limit the size of your report by not showing changes in status after the date you select.|, + lastUpdated =>1139265525 + }, + '16' => { message => q|Start Date|, lastUpdated =>1091624565 }, + '16 description' => { + message => q|The Start Date can help limit the size of your report by not showing changes in status before the date you select.|, + lastUpdated =>1139262071 + }, + '15' => { message => q|Never Checked In|, lastUpdated =>1091624565 @@ -155,6 +228,11 @@ A variable that returns the HTML necessary to create a Traditional Pagination Ba lastUpdated =>1091624565 }, + '14 description' => { + message => q|Select how many lines you want in each page of the report. You will be provided links to access additional pages of the report.|, + lastUpdated =>1139264214 + }, + '13' => { message => q|Report Template|, lastUpdated =>1091624565 @@ -195,11 +273,21 @@ A variable that returns the HTML necessary to create a Traditional Pagination Ba lastUpdated =>1091624565 }, + '6 description' => { + message => q|You can enter in reasons for the change in status (doctor's appointment, went home) etc. here.|, + lastUpdated =>1139254446 + }, + 'delegate' => { message => q|Update status for: |, lastUpdated =>1122319088 }, + 'delegate description' => { + message => q|Select a name from this list to update the status for someone other than yourself.|, + lastUpdated =>1139253866 + }, + 'myself' => { message => q|Myself|, lastUpdated =>1122319088 @@ -210,6 +298,11 @@ A variable that returns the HTML necessary to create a Traditional Pagination Ba lastUpdated =>1091624565 }, + '5 description' => { + message => q|You may select one status from the list. If you would like to further explain the reason for the status, use the "What's happening" field.|, + lastUpdated =>1139253909 + }, + '4' => { message => q|View Report|, lastUpdated =>1091624565 @@ -260,6 +353,11 @@ A variable that returns the HTML necessary to create a Traditional Pagination Ba lastUpdated =>1123266322 }, + 'filter departments description' => { + message => q|Each In/Out Board can be configured to serve multiple departments. By default, all departments are shown in the report. Select the name of any one department to limit the report to only display status changes from that department.| , + lastUpdated =>1139262439 + }, + };