X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fnotes.html;h=1e9f464db56d4682f755486cdf3ef0ef79a6dd6a;hb=c4b71bc4459cb7d403cbebede470aeb2c6292a6e;hp=4c97c9f64db8de39d454671b2cf9d820943b84bf;hpb=7efc882e67c25728c07990e852a590cbddfc1dc6;p=freeside.git diff --git a/httemplate/view/cust_main/notes.html b/httemplate/view/cust_main/notes.html index 4c97c9f64..1e9f464db 100755 --- a/httemplate/view/cust_main/notes.html +++ b/httemplate/view/cust_main/notes.html @@ -1,19 +1,43 @@ % if ( scalar(@notes) ) { - <% include('/elements/init_overlib.html') %> - - <% include("/elements/table-grid.html") %> - - - Date - Time - Person - Note - + + + <& /elements/init_overlib.html &> % my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; % my $bgcolor = ''; +% my $last_classnum = -1; +% my $skipheader = 0; +% my %classes = (); % % foreach my $note (@notes) { % @@ -30,35 +54,91 @@ % 'edit/cust_main_note.cgi'. % "?custnum=$custnum". % ";notenum=$notenum", -% 'actionlabel' => 'Edit customer note', +% 'actionlabel' => emt('Edit customer note'), % 'width' => 616, -% 'height' => 408, +% 'height' => 538, #575 % 'frame' => 'top', % ); % my $clickjs = qq!onclick="$onclick"!; % % my $edit = ''; % if ($curuser->access_right('Edit customer note') ) { -% $edit = qq! (edit)!; +% $edit = qq! (!.emt('edit').')'; +% } +% +% if ( $last_classnum != $note->classnum && !$skipheader ) { +% my $tmp_classnum = $note->classnum ? $note->classnum : 0; +% $classes{$tmp_classnum} = $note->classname ne '' ? $note->classname +% : emt('Other'); +% if ( $last_classnum != -1 ) { + + +% } +% my $display = ($tmp_classnum == 0 || !$conf->exists('note-classes') +% || $conf->config('note-classes') < 2) +% ? 'block' : 'none'; +
+ <& /elements/table-grid.html &> + + <% mt('Date') |h %> +% if ( $conf->exists('cust_main_note-display_times') ) { + <% mt('Time') |h %> +% } + <% mt('Person') |h %> +% if ($conf->exists('note-classes') && $conf->config('note-classes') == 1) { + <% mt('Class') |h %> +% } + <% mt('Note') |h %> +% if ($curuser->access_right('Edit customer note') ) { +   % } + +% $skipheader = (!$conf->exists('note-classes') || $conf->config('note-classes') < 2); +% $last_classnum = $note->classnum; +% } <% note_datestr($note,$conf,$bgcolor) %> -  <% $note->otaker%> +  <% $note->usernum ? $note->access_user->name : $note->otaker %> + +% if ($conf->exists('note-classes') && $conf->config('note-classes') == 1) { + + <% $note->classname %> +% } -  <%$note->comments%><% $edit %> + <% $note->comments | defang %> +% if($edit) { + <% $edit %> +% } % } #end display notes +
+ +% if ( $conf->exists('note-classes') && $conf->config('note-classes') == 2 ) { +% my($classnum,$classname); +<% mt('Show notes of class:') |h %>   +% foreach my $classnum ( sort { $b <=> $a } (keys %classes) ) { + <% $classes{$classnum} %> +% } +
+% } % } <%init> +use HTML::Defang; + my $conf = new FS::Conf; my $curuser = $FS::CurrentUser::CurrentUser; @@ -67,15 +147,15 @@ my(%opt) = @_; my $custnum = $opt{'custnum'}; my $cust_main = qsearchs('cust_main', {'custnum' => $custnum} ); -die "Custimer not found!" unless $cust_main; +die "Customer not found!" unless $cust_main; -my (@notes) = $cust_main->notes(); +my (@notes) = $cust_main->notes($conf->exists('note-classes') && $conf->config('note-classes') == 2); #subroutines sub note_datestr { my($note, $conf, $bgcolor) = @_ or return ''; - my $td = ''; + my $td = qq{}; my $format = "$td%b %o, %Y"; $format .= "$td%l:%M%P" if $conf->exists('cust_main_note-display_times');