From feba5016425b52740c29653383343d0d1887a592 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Mon, 17 Aug 2015 22:22:02 -0700 Subject: display dates as real dates in Excel export, #23121, update for current RT --- rt/share/html/Elements/ShowCustomFieldDate | 6 +++++- rt/share/html/Elements/ShowCustomFieldDateTime | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/ShowCustomFieldDate b/rt/share/html/Elements/ShowCustomFieldDate index 92ab7679a..1536935c5 100644 --- a/rt/share/html/Elements/ShowCustomFieldDate +++ b/rt/share/html/Elements/ShowCustomFieldDate @@ -49,7 +49,11 @@ my $content = $Object->Content; my $DateObj = RT::Date->new ( $session{'CurrentUser'} ); $DateObj->Set( Format => 'unknown', Value => $content, Timezone => 'utc' ); - $content = $DateObj->AsString(Time => 0, Timezone => 'utc'); + if ($m->notes('FormatDate')) { + $content = $m->notes('FormatDate')->($DateObj); + } else { + $content = $DateObj->AsString(Time => 0, Timezone => 'utc'); + } <%$content|n%> <%ARGS> diff --git a/rt/share/html/Elements/ShowCustomFieldDateTime b/rt/share/html/Elements/ShowCustomFieldDateTime index 2ba873aad..e179d6a4b 100644 --- a/rt/share/html/Elements/ShowCustomFieldDateTime +++ b/rt/share/html/Elements/ShowCustomFieldDateTime @@ -49,7 +49,11 @@ my $content = $Object->Content; my $DateObj = RT::Date->new ( $session{'CurrentUser'} ); $DateObj->Set( Format => 'ISO', Value => $content ); - $content = $DateObj->AsString; + if ($m->notes('FormatDate')) { + $content = $m->notes('FormatDate')->($DateObj); + } else { + $content = $DateObj->AsString; + } <%$content|n%> <%ARGS> -- cgit v1.2.1 From d0b3acc1efb65855d5e52d54c33bb035c9776e2d Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 5 Oct 2015 18:35:13 -0700 Subject: ticket_system-appointment-queueid config, RT#34237 --- rt/share/html/Elements/CalendarSlotSchedule | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/CalendarSlotSchedule b/rt/share/html/Elements/CalendarSlotSchedule index 045d6e436..4a9b3bcc3 100644 --- a/rt/share/html/Elements/CalendarSlotSchedule +++ b/rt/share/html/Elements/CalendarSlotSchedule @@ -87,7 +87,11 @@ % # (XXX and eventually, package) % my $cust_main = qsearchs('cust_main', { custnum=>$custnum } ) % or die "unknown custnum $custnum"; -% my $Queue = $cust_main->agent->ticketing_queueid || 1; # || $default_queueid;#XXX really, pick pkg_category queue +% +% my $conf = new FS::Conf; +% my $Queue = $conf->config('ticket_system-appointment-queueid') +% or die "ticket_system-appointment-queueid configuration not set"; +% % my $member = "freeside://freeside/cust_main/$custnum"; % %warn my $Starts = int($tod_row/60). ':'. sprintf('%02d',$tod_row%60). ':00'; -- cgit v1.2.1 From 05c0b947ddba67a8ac2537c010a583277623ff3e Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 5 Oct 2015 20:12:09 -0700 Subject: show customer name on appointments, RT#34237 --- rt/share/html/Elements/CalendarDaySchedule | 7 ++++++- rt/share/html/Elements/CalendarSlotSchedule | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/CalendarDaySchedule b/rt/share/html/Elements/CalendarDaySchedule index 5be5b06bc..bac9a78d4 100644 --- a/rt/share/html/Elements/CalendarDaySchedule +++ b/rt/share/html/Elements/CalendarDaySchedule @@ -31,8 +31,13 @@ $CurrentUser => undef % my( $starts, $due, $col, $t ) = @{ $schedule{'scheduled'}->{$id} }; % my $s = int(($starts-$stime)/10); % my $e = int(($due-$stime)/10)-1; + +% #false laziness w/misc/xmlhttp-ticket-update.html & CalendarSlotSchedule +% my %hash = $m->comp('/Ticket/Elements/Customers', Ticket => $t); +% my @cust_main = values( %{$hash{cust_main}} ); + = $tod_row ) { #first row +% +% #false laziness w/misc/xmlhttp-ticket-update.html & CalendarDaySchedule +% my %hash = $m->comp('/Ticket/Elements/Customers', Ticket => $t); +% my @cust_main = values( %{$hash{cust_main}} ); +% % $content .= ($content?', ':''). #$id. ': '. % #false laziness w/xmlhttp-ticket-update.html % FS::sched_avail::pretty_time($starts). '-'. -% FS::sched_avail::pretty_time($due); +% FS::sched_avail::pretty_time($due). +% ': '. encode_entities($cust_main[0]->_FreesideURILabel); % #'install for custname XX miles away'; #XXX placeholder/more % $draggable_ticketid = $id; % $draggable_length = $due - $starts; -- cgit v1.2.1 From f27e48e51e2154468d960f1be656538373332ee5 Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Tue, 6 Oct 2015 20:17:42 -0500 Subject: RT#38481: installer scheduling: redirect to basics (custom field edit) page instead of ticket view --- rt/share/html/Elements/CalendarSlotSchedule | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/CalendarSlotSchedule b/rt/share/html/Elements/CalendarSlotSchedule index 632fabba3..251347148 100644 --- a/rt/share/html/Elements/CalendarSlotSchedule +++ b/rt/share/html/Elements/CalendarSlotSchedule @@ -9,6 +9,7 @@ $LengthMin => $default_timestep $custnum => undef $pkgnum => undef + $RedirectToBasics => 0 % foreach my $username ( @username ) { % @@ -110,7 +111,8 @@ % '&Starts='. $Date->strftime('%F').'%20'. $Starts. % '&Due='. $Date->strftime('%F').'%20'. $Due. % '&new-MemberOf='. $member. #XXX uri_escape? -% '&Status=new'; +% '&Status=new'. +% '&RedirectToBasics='.$RedirectToBasics; % #'&Requestors='. #XXX Freeside customer requestor(s) (package? onmouseover = "boxon(this);" -- cgit v1.2.1