[freeside-commits] branch master updated. b8fa095812b8ad74263a2d4a25caa97871d7d34b

[Jonathan Prykop]

The branch, master has been updated
       via  b8fa095812b8ad74263a2d4a25caa97871d7d34b (commit)
      from  4c4bf4f91c1bb61c85b1e73d0eddad20708fd89c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b8fa095812b8ad74263a2d4a25caa97871d7d34b
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Mon Apr 11 10:20:53 2016 -0500

    RT#34237: installer scheduling [3-line cells]

diff --git a/rt/share/html/Elements/CalendarSlotSchedule b/rt/share/html/Elements/CalendarSlotSchedule
index b5c08d6..f12b4a6 100644
--- a/rt/share/html/Elements/CalendarSlotSchedule
+++ b/rt/share/html/Elements/CalendarSlotSchedule
@@ -21,7 +21,8 @@
 %
 %   my $bgcolor = '#666666';
 %   my $border = '1px solid #555555';
-%   my $label = '';
+%   my $label_time = '';
+%   my $label_title = '';
 %   my $selectable = 0; # can we schedule a new appointment
 %   my $ticketid = 0;
 %   my $draggable_length = 0;
@@ -72,10 +73,10 @@
 %     my @cust_main = values( %{$hash{cust_main}} );
 %
 %     #false laziness w/xmlhttp-ticket-update.html
-%     $label .= FS::sched_avail::pretty_time($starts). '-'.
-%               FS::sched_avail::pretty_time($due).
-%               ': '. $cust_main[0]->_FreesideURILabel;
-%               #'install for custname XX miles away'; #XXX placeholder/more
+%     $label_time = FS::sched_avail::pretty_time($starts). '-'.
+%                   FS::sched_avail::pretty_time($due);
+%     $label_title = $cust_main[0]->_FreesideURILabel;
+%     #'install for custname XX miles away'; #XXX placeholder/more
 %
 %     $offset = int( ($tod_row - $starts) / $timestep );
 %     $offset++ if ($tod_row - $starts) % $timestep;
@@ -158,7 +159,8 @@
         $cell_<% $td_id %>,
         <% $ticketid |js_string %>,
         <% $bgcolor |n,js_string %>,
-        <% $label |n,js_string %>,
+        <% $label_time |n,js_string %>,
+        <% $label_title |n,js_string %>,
         <% $draggable_length * 60 %>,
         <% $cells %>,
         <% $offset %>
diff --git a/rt/share/html/Search/Schedule.html b/rt/share/html/Search/Schedule.html
index 6a62c27..df7b53d 100644
--- a/rt/share/html/Search/Schedule.html
+++ b/rt/share/html/Search/Schedule.html
@@ -12,9 +12,10 @@
       $cell.data('div',$div);
       $cell.append($div);
     }
+    $div.css('white-space','nowrap');
     $div.css('width','100%');
     $div.css('background-color', bgcolor);
-    $div.html(content || ' ');
+    $div.html(content || ' <br> <br> ');
   }
 
   // gives cell the appearance dictated by its data
@@ -37,12 +38,13 @@
   }
 
   // sets cell data and appearance as an appointment
-  function set_appointment_cell ($cell,ticketid,bgcolor,label,length,cells,offset) {
+  function set_appointment_cell ($cell,ticketid,bgcolor,labeltime,labeltitle,length,cells,offset) {
     $cell.data('bgcolor',  bgcolor );
     $cell.data('ticketid', ticketid );
     $cell.data('length',   length );
     $cell.data('cells',    cells );
     $cell.data('offset',   offset );
+    var label = labeltime + ' <br>' + labeltitle + ' <br>';
     $cell.data('label',  label );
     $cell.data('content', '');
     if ( offset == 0 ) { // first row
@@ -295,6 +297,8 @@
       } else {
 
         var label = data.sched_label;
+        var labeltime = data.sched_label_time;
+        var labeltitle = data.sched_label_title;
 
         // jump to first cell in appointment
         var rownum = dragcell.parent().prevAll('tr').length;
@@ -325,7 +329,7 @@
                         '_' + String( n_tod_row ) +
                         '_' + username;
           var $cell = $('#'+n_td_id);
-          set_appointment_cell($cell,ticketid,bgcolor,label,length,cells,d);
+          set_appointment_cell($cell,ticketid,bgcolor,labeltime,labeltitle,length,cells,d);
           set_draggable_cell($cell);
           set_droppable_cell($cell);
         }

-----------------------------------------------------------------------

Summary of changes:
 rt/share/html/Elements/CalendarSlotSchedule |   14 ++++++++------
 rt/share/html/Search/Schedule.html          |   10 +++++++---
 2 files changed, 15 insertions(+), 9 deletions(-)