[Fmsystem-commits] [8979] bkbooking: bugfix completed_reservation_export + added more colors to schedule

[Kjell Arne Espedal]

Revision: 8979
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8979
Author:   kjell
Date:     2012-03-14 14:43:01 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
bkbooking: bugfix completed_reservation_export + added more colors to schedule

Modified Paths:
--------------
    trunk/booking/inc/class.socompleted_reservation_export.inc.php
    trunk/booking/js/booking/schedule.js
    trunk/booking/templates/base/css/base.css

Modified: trunk/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
--- trunk/booking/inc/class.socompleted_reservation_export.inc.php      
2012-03-14 12:42:22 UTC (rev 8978)
+++ trunk/booking/inc/class.socompleted_reservation_export.inc.php      
2012-03-14 14:43:01 UTC (rev 8979)
@@ -224,7 +224,7 @@
                                }
                        }
                        
-                       $reservations = 
$this->completed_reservation_so->read(array('filters' => $filters, 'results' => 
'all', 'order' => 
'customer_type,customer_identifier_type,customer_organization_number,customer_ssn,to_',
 'dir' => 'asc'));
+                       $reservations = 
$this->completed_reservation_so->read(array('filters' => $filters, 'results' => 
'all', 'sort' => 
'customer_type,customer_identifier_type,customer_organization_number,customer_ssn,to_',
 'dir' => 'asc'));
                        
                        if (count($reservations['results']) > 0) {
                                return $reservations['results'];

Modified: trunk/booking/js/booking/schedule.js
===================================================================
--- trunk/booking/js/booking/schedule.js        2012-03-14 12:42:22 UTC (rev 
8978)
+++ trunk/booking/js/booking/schedule.js        2012-03-14 14:43:01 UTC (rev 
8979)
@@ -1,5 +1,9 @@
 colors = ['color1', 'color2', 'color3', 'color4', 'color5', 'color6', 
'color7', 'color8', 'color9', 'color10',
-                 'color11', 'color12', 'color13', 'color14', 'color15', 
'color16', 'color17', 'color18', 'color19', 'color20'];
+                 'color11', 'color12', 'color13', 'color14', 'color15', 
'color16', 'color17', 'color18', 'color19', 'color20',
+          'color21', 'color22', 'color23', 'color24', 'color25', 'color26', 
'color27', 'color28', 'color29', 'color30',
+          'color31', 'color32', 'color33', 'color34', 'color35', 'color36', 
'color37', 'color38', 'color39', 'color40',
+          'color41', 'color42', 'color43', 'color44', 'color45', 'color46', 
'color47', 'color48', 'color49', 'color50',
+          'color51', 'color52', 'color53', 'color54', 'color55', 'color56', 
'color57', 'color58', 'color59', 'color60',];
 colorMap = {};
 
 YAHOO.booking.shorten = function(text, max) {
@@ -30,7 +34,7 @@
 YAHOO.booking.frontendScheduleColorFormatter = function(elCell, oRecord, 
oColumn, booking) { 
        if(booking) {
                if(!colorMap[booking.name]) {
-                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color20';
+                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color50';
                }
                var color = colorMap[booking.name];
                YAHOO.util.Dom.addClass(elCell, 'info');
@@ -99,7 +103,7 @@
 YAHOO.booking.backendScheduleColorFormatter = function(elCell, oRecord, 
oColumn, booking) { 
        if(booking) {
                if(!colorMap[booking.name]) {
-                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color20';
+                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color50';
                }
                var color = colorMap[booking.name];
                YAHOO.util.Dom.addClass(elCell, color);
@@ -114,7 +118,7 @@
 YAHOO.booking.scheduleColorFormatter = function(elCell, oRecord, oColumn, 
booking) { 
        if(booking) {
                if(!colorMap[booking.name]) {
-                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color20';
+                       colorMap[booking.name] = colors.length ? colors.shift() 
: 'color50';
                }
                var color = colorMap[booking.name];
                YAHOO.util.Dom.addClass(elCell, color);

Modified: trunk/booking/templates/base/css/base.css
===================================================================
--- trunk/booking/templates/base/css/base.css   2012-03-14 12:42:22 UTC (rev 
8978)
+++ trunk/booking/templates/base/css/base.css   2012-03-14 14:43:01 UTC (rev 
8979)
@@ -182,12 +182,12 @@
 #schedule_container tr td { border-top: 1px solid #ccc; background: white; 
white-space: nowrap; }
 #schedule_container tr td:first-child { background: #eee; }
 #schedule_container tr.time td { border-top: 1px solid #444;}
-#schedule_container .color1  { background-color: #ccf;}
-#schedule_container .color2  { background-color: #cfc;}
-#schedule_container .color3  { background-color: #fcc;}
-#schedule_container .color4  { background-color: #ffb;}
-#schedule_container .color5  { background-color: #bff;}
-#schedule_container .color6  { background-color: #fbf;}
+#schedule_container .color1  { background-color: #ccccff;}
+#schedule_container .color2  { background-color: #ccffcc;}
+#schedule_container .color3  { background-color: #ffcccc;}
+#schedule_container .color4  { background-color: #ffffbb;}
+#schedule_container .color5  { background-color: #bbffff;}
+#schedule_container .color6  { background-color: #ffbbff;}
 #schedule_container .color7  { background-color: #de6d6d;} /* indianred */
 #schedule_container .color8  { background-color: #f0f0f0;} /* gray */
 #schedule_container .color9  { background-color: #6495ed;} /* cornflowerblue */
@@ -202,6 +202,46 @@
 #schedule_container .color18 { background-color: #bdb76b;} /* darkkhaki */
 #schedule_container .color19 { background-color: #32cd32;} /* limegreen */
 #schedule_container .color20 { background-color: #ffe4b5;} /* moccasin */
+#schedule_container .color21 { background-color: #ff4040;} 
+#schedule_container .color22 { background-color: #ee3b3b;} 
+#schedule_container .color23 { background-color: #cd3333;} 
+#schedule_container .color24 { background-color: #8b2323;} 
+#schedule_container .color25 { background-color: #deb887;} 
+#schedule_container .color26 { background-color: #ffd39b;} 
+#schedule_container .color27 { background-color: #eec591;} 
+#schedule_container .color28 { background-color: #5f9ea0;} 
+#schedule_container .color29 { background-color: #98f5ff;} 
+#schedule_container .color30 { background-color: #8ee5ee;} 
+#schedule_container .color31 { background-color: #53868b;} 
+#schedule_container .color32 { background-color: #66cd00;} 
+#schedule_container .color33 { background-color: #458b00;} 
+#schedule_container .color34 { background-color: #d2691e;} 
+#schedule_container .color35 { background-color: #ff7f24;} 
+#schedule_container .color36 { background-color: #8b4513;} 
+#schedule_container .color37 { background-color: #ff7256;} 
+#schedule_container .color38 { background-color: #ffb90f;} 
+#schedule_container .color39 { background-color: #cd950c;} 
+#schedule_container .color40 { background-color: #8fbc8f;} 
+#schedule_container .color41 { background-color: #8b0000;} 
+#schedule_container .color42 { background-color: #c1ffc1;} 
+#schedule_container .color43 { background-color: #b4eeb4;} 
+#schedule_container .color44 { background-color: #9bcd9b;} 
+#schedule_container .color45 { background-color: #698b69;} 
+#schedule_container .color46 { background-color: #433d8b;} 
+#schedule_container .color47 { background-color: #ee1289;} 
+#schedule_container .color48 { background-color: #cd1076;} 
+#schedule_container .color49 { background-color: #8b0a50;} 
+#schedule_container .color50 { background-color: #ccc} 
+#schedule_container .color51 { background-color: #ddd;} 
+#schedule_container .color52 { background-color: #eee;} 
+#schedule_container .color53 { background-color: #333;} 
+#schedule_container .color54 { background-color: #444;} 
+#schedule_container .color55 { background-color: #555;} 
+#schedule_container .color56 { background-color: #666;} 
+#schedule_container .color57 { background-color: #777;} 
+#schedule_container .color58 { background-color: #888;} 
+#schedule_container .color59 { background-color: #999;} 
+#schedule_container .color60 { background-color: #aaa;} 
 
 #boundary-table td, #boundary-table th { 
     padding: .1em .2em;