[Fmsystem-commits] [12180] bkbooking: stavanger forandret instillinger p?\195? \165 hall skjerm visning

[Kjell Arne Espedal]

Revision: 12180
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12180
Author:   kjell
Date:     2014-10-15 07:41:15 +0000 (Wed, 15 Oct 2014)
Log Message:
-----------
bkbooking: stavanger  forandret instillinger p?\195?\165 hall skjerm visning

Modified Paths:
--------------
    branches/stavangerkommune/bookingfrontend/inc/class.uibuilding.inc.php

Modified: branches/stavangerkommune/bookingfrontend/inc/class.uibuilding.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uibuilding.inc.php      
2014-10-14 23:12:35 UTC (rev 12179)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uibuilding.inc.php      
2014-10-15 07:41:15 UTC (rev 12180)
@@ -27,33 +27,18 @@
 
             $building = $this->bo->read_single(phpgw::get_var('id', 'GET'));
             $start = phpgw::get_var('start', 'GET');
+            $end = phpgw::get_var('end', 'GET');
             $res = phpgw::get_var('res', 'GET');
             $color = phpgw::get_var('color', 'GET');
             $fontsize = phpgw::get_var('fontsize', 'GET');
             $weekend = phpgw::get_var('weekend', 'GET');
 
-            $timestart = 8.0;
-            $timeend = 16.0;
-            if ($start == 0) {
-                $timestart = 0.0;
-                $timeend = 4.0;
-            } elseif ($start == 1) {
-                $timestart = 4.0;
-                $timeend = 8.0;
-            } elseif ($start == 2) {
-                $timestart = 8.0;
-                $timeend = 12.0;
-            } elseif ($start == 3) {
-                $timestart = 12.0;
-                $timeend = 16.0;
-            } elseif ($start == 4) {
-                $timestart = 16.0;
-                $timeend = 20.0;
-            } elseif ($start == 5) {
-                $timestart = 20.0;
-                $timeend = 24.0;
-            }
+            $timestart = $start;
+            $timeend = $end;
 
+            $timediff = $timeend-$timestart;
+            $cellwidth = 88/($timediff*2);
+
             $days = array(
                 "Mon" => "Mandag",
                 "Tue" => "Tirsdag",
@@ -136,8 +121,8 @@
             $html .= '<tr>';
             $html .= '<th colspan="2" style="text-align: left; width: 
12%;">Bane</th>';
             while ($time < $timeend) {
-                $html .= '<th colspan="1" style="width: 11%; text-align: 
left;">'.str_pad($time,2,'0', STR_PAD_LEFT).':00</th>';
-                $html .= '<th colspan="1" style="width: 11%; text-align: 
left;">'.str_pad($time,2,'0', STR_PAD_LEFT).':30</th>';
+                $html .= '<th colspan="1" style="width: '.$cellwidth.'%; 
text-align: left;">'.str_pad($time,2,'0', STR_PAD_LEFT).':00</th>';
+                $html .= '<th colspan="1" style="width: '.$cellwidth.'%; 
text-align: left;">'.str_pad($time,2,'0', STR_PAD_LEFT).':30</th>';
                 $time += 1;
             }
             $html .= '</tr>';