From 7c7b2d3b54084319ed0d6392f9ea13e00173f011 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sat, 29 Dec 2012 13:58:59 +0100 Subject: [PATCH] polished code and display of shiftview and used more icons --- includes/pages/admin_user.php | 2 +- includes/pages/admin_user_angeltypes.php | 9 ++- includes/pages/user_myshifts.php | 4 +- includes/pages/user_shifts.php | 94 +++++++++++++---------- includes/sys_lang.php | 10 ++- includes/sys_template.php | 5 ++ public/pic/icons/cross.png | Bin 655 -> 638 bytes public/pic/icons/lock.png | Bin 749 -> 683 bytes public/pic/icons/pencil.png | Bin 450 -> 391 bytes public/pic/icons/tick.png | Bin 537 -> 535 bytes 10 files changed, 71 insertions(+), 53 deletions(-) diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 94e90a24..180e7371 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -323,7 +323,7 @@ function admin_user() { 'Tshirt' => '' . $angel['Tshirt'] . '', 'Size' => $angel['Size'], 'lastLogIn' => date('d.m.&\n\b\s\p;H:i', $angel['lastLogIn']), - 'edit' => '' . Get_Text('Edit') . '', + 'edit' => img_button(page_link_to('admin_user') . '&id=' . $angel['UID'], 'pencil', 'edit'), ); } $angels = array_map('prepare_angel_table', $angels); diff --git a/includes/pages/admin_user_angeltypes.php b/includes/pages/admin_user_angeltypes.php index 2f7a511e..b77a9129 100644 --- a/includes/pages/admin_user_angeltypes.php +++ b/includes/pages/admin_user_angeltypes.php @@ -78,11 +78,12 @@ function admin_user_angeltypes() { foreach ($user_angel_types_source as $user) { if(in_array("admin_user", $privileges)) $user['Nick'] = '' . $user['Nick'] . ''; - $user['actions'] = 'confirm'; - $user['actions'] .= '  deny'; + $user['actions'] = img_button(page_link_to('admin_user_angeltypes') . '&confirm=' . $user['id'], 'tick', 'confirm'); + $user['actions'] .= '  '; + $user['actions'] .= img_button(page_link_to('admin_user_angeltypes') . '&deny=' . $user['id'], 'cross', 'deny'); $users[] = $user; } - $content[] = '

' . $angel_type['name'] . ' confirm all deny all

' . table(array ( + $content[] = '

' . $angel_type['name'] . ' ' . img_button(page_link_to('admin_user_angeltypes') . '&confirm_all=' . $angel_type['id'], 'tick', '', 'confirm all') . ' ' . img_button(page_link_to('admin_user_angeltypes') . '&deny_all=' . $angel_type['id'], 'cross', '', 'deny all') . '

' . table(array ( 'Nick' => "Nick", 'actions' => "" ), $users); @@ -109,4 +110,4 @@ function admin_new_user_angeltypes() { } return ""; } -?> \ No newline at end of file +?> diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index 353eac56..007a1681 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -97,9 +97,9 @@ function user_myshifts() { $html .= '' . $shift['Comment'] . ''; $html .= ''; if ($id == $user['UID']) - $html .= '' . Get_Text('edit') . ''; + $html .= img_button(page_link_to('user_myshifts') . '&edit=' . $shift['id'], 'pencil', 'edit'); if (($shift['start'] - time() > $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) - $html .= ' | ' . Get_Text('sign_off') . ''; + $html .= img_button(page_link_to('user_myshifts') . (($id != $user['UID'])? '&id=' . $id : '') . '&cancel=' . $shift['id'], 'cross', 'sign_off'); $html .= ''; $html .= ''; } diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index c26ad668..7db94247 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -350,7 +350,7 @@ function view_user_shifts() { FROM `Shifts` INNER JOIN `Room` USING (`RID`) LEFT JOIN (SELECT COUNT(*) AS special_needs , nat3.`shift_id` FROM `NeededAngelTypes` AS nat3 WHERE `shift_id` IS NOT NULL GROUP BY nat3.`shift_id`) AS nat2 ON nat2.`shift_id` = `Shifts`.`SID` - INNER JOIN `NeededAngelTypes` AS nat ON nat.`count` != 0 AND ((nat2.`special_needs` > 0 AND nat.`shift_id` = `Shifts`.`SID`) OR ((nat2.`special_needs` = 0 OR nat2.`special_needs` IS NULL) AND nat.`room_id` = `RID`)) + INNER JOIN `NeededAngelTypes` AS nat ON nat.`count` != 0 AND nat.`angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") AND ((nat2.`special_needs` > 0 AND nat.`shift_id` = `Shifts`.`SID`) OR ((nat2.`special_needs` = 0 OR nat2.`special_needs` IS NULL) AND nat.`room_id` = `RID`)) LEFT JOIN (SELECT se.`SID`, se.`TID`, COUNT(*) as count FROM `ShiftEntry` AS se GROUP BY se.`SID`, se.`TID`) AS entries ON entries.`SID` = `Shifts`.`SID` AND entries.`TID` = nat.`angel_type_id` WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ") AND DATE(FROM_UNIXTIME(`start`)) IN ('" . implode("','", $_SESSION['user_shifts']['days']) . "') "; @@ -384,60 +384,71 @@ function view_user_shifts() { ) */ if(count($_SESSION['user_shifts']['days'])==1 && $_SESSION['user_shifts']['new_style']) { - $myrooms=$rooms; - foreach($myrooms as $k => $v) { + $myrooms = $rooms; + + // delete un-selected rooms from array + foreach($myrooms as $k => $v) if(array_search($v["id"],$_SESSION['user_shifts']['rooms'])===FALSE) unset($myrooms[$k]); - } + $first=date("U",strtotime($_SESSION['user_shifts']['days'][0]." 00:00:00")); $last=date("U",strtotime($_SESSION['user_shifts']['days'][0]." 23:59:59")); $maxshow=24*4; $block=array(); $todo=array(); - foreach($myrooms as $room) { - $rid=$room["id"]; - $block[$rid] = array_fill(0, $maxshow, 0); - foreach($shifts as $shift) { - if($shift["RID"]==$rid) { - // calculate number of parallel shifts in each timeslot for one room - $blocks=($shift["end"]-$shift["start"])/(15*60); - $firstblock=floor(($shift["start"]-$first)/(15*60)); - for($i=$firstblock;$i<$blocks+$firstblock && $i < $maxshow;$i++) { - $block[$rid][$i]++; - } - } - } + + // initialize $block array + foreach($myrooms as $room) + $block[$room["id"]] = array_fill(0, $maxshow, 0); + + // calculate number of parallel shifts in each timeslot for each room + foreach($shifts as $shift) { + $rid = $shift["RID"]; + $blocks = ($shift["end"]-$shift["start"]) / (15*60); + $firstblock = floor(($shift["start"]-$first) / (15*60)); + for($i = $firstblock; $i < $blocks + $firstblock && $i < $maxshow; $i++) + $block[$rid][$i]++; } - $shifts_table=""; - foreach($myrooms as $room) { - $rid=$room["id"]; + + $shifts_table = "
-
"; + foreach($myrooms as $key => $room) { + $rid = $room["id"]; + if(array_sum($block[$rid]) == 0) { + // do not display columns without entries + unset($block[$rid]); + unset($myrooms[$key]); + continue; + } $colspan = call_user_func_array('max', $block[$rid]); if($colspan == 0) $colspan = 1; $todo[$rid] = array_fill(0, $maxshow, $colspan); $shifts_table.=" 1)? ' colspan="' . $colspan . '"' : '') . ">${room['name']}\n"; } + unset($block, $blocks, $firstblock, $colspan, $key, $room); + $shifts_table.=""; - for($i=0;$i<$maxshow;$i++) { - $thistime=$first+($i*15*60); - if($thistime%(60*60)==0) { - $shifts_table.=""; + for($i = 0; $i < $maxshow; $i++) { + $thistime = $first + ($i*15*60); + if($thistime%(60*60) == 0) { + $shifts_table .= ""; } else { - $shifts_table.=""; + $shifts_table .= ""; } foreach($myrooms as $room) { - $rid=$room["id"]; + $rid = $room["id"]; foreach($shifts as $shift) { - if($shift["RID"]==$rid) { + if($shift["RID"] == $rid) { if(floor($shift["start"]/(15*60)) == $thistime/(15*60)) { - $blocks=($shift["end"]-$shift["start"])/(15*60); - if($blocks<1) $blocks=1; + $blocks = ($shift["end"]-$shift["start"])/(15*60); + if($blocks < 1) + $blocks = 1; // qqqqqq $is_free = false; $shifts_row = $shift['name']; if (in_array('admin_shifts', $privileges)) - $shifts_row .= ' [edit][x]'; - $shifts_row.= '
'; + $shifts_row .= ' ' . img_button('?p=user_shifts&edit_shift=' . $shift['SID'], 'pencil', 'edit') . img_button('?p=user_shifts&delete_shift=' . $shift['SID'], 'cross', 'delete'); + $shifts_row .= '
'; $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id` FROM `NeededAngelTypes` JOIN `AngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`) @@ -460,7 +471,7 @@ function view_user_shifts() { $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`"); $entry_list = array (); foreach ($entries as $entry) { - if($entry['Gekommen']==1) + if($entry['Gekommen'] == 1) $style="font-weight:bold;"; else $style="font-weight:normal;"; @@ -490,7 +501,7 @@ function view_user_shifts() { // User shift admins may join anybody in every shift $user_may_join_shift |= in_array('user_shifts_admin', $privileges); if ($user_may_join_shift) - $entry_list[] = '' . $inner_text . ' »'; + $entry_list[] = '' . $inner_text . ' »'; else { if(time() > $shift['start']) { $entry_list[] = $inner_text . ' (vorbei)'; @@ -510,7 +521,7 @@ function view_user_shifts() { $shifts_row .= '
'; } if (in_array('user_shifts_admin', $privileges)) { - $shifts_row .= 'Weitere Helfer eintragen »'; + $shifts_row .= 'Weitere Helfer eintragen »'; } } $shifts_table.='"; - for($j=0;$j<$blocks&& $i+$j < $maxshow;$j++) { + for($j=0; $j < $blocks && $i+$j < $maxshow; $j++) { $todo[$rid][$i+$j]--; } } } } // fill up row with empty '; + while($todo[$rid][$i]-- > 0) + $shifts_table .= ''; } - $shifts_table.="\n"; + $shifts_table .= "\n"; } - $shifts_table.='
-
".date("H:i",$thistime)."
" . date("H:i",$thistime) . "
'; @@ -518,19 +529,19 @@ function view_user_shifts() { $shifts_table.=$shifts_row; } $shifts_table.=" - while($todo[$rid][$i]--) - $shifts_table.='
'; + $shifts_table .= ''; // qqq } else { $shifts_table = array(); @@ -548,7 +559,7 @@ function view_user_shifts() { ); if (in_array('admin_shifts', $privileges)) - $shift_row['entries'] .= ' [edit] [x]'; + $shift_row['info'] .= ' ' . img_button('?p=user_shifts&edit_shift=' . $shift['SID'], 'pencil', 'edit') . img_button('?p=user_shifts&delete_shift=' . $shift['SID'], 'cross', 'delete'); $shift_row['entries'] .= '
'; $is_free = false; $shift_has_special_needs = 0 < sql_num_query("SELECT `id` FROM `NeededAngelTypes` WHERE `shift_id` = " . $shift['SID']); @@ -573,7 +584,7 @@ function view_user_shifts() { $entry_list = array (); foreach ($entries as $entry) { if (in_array('user_shifts_admin', $privileges)) - $entry_list[] = '' . $entry['Nick'] . ' [x]'; + $entry_list[] = '' . $entry['Nick'] . ' ' . img_button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], 'cross', 'delete'); else $entry_list[] = $entry['Nick']; } @@ -623,7 +634,6 @@ function view_user_shifts() { } if (($is_free && in_array(0, $_SESSION['user_shifts']['filled'])) || (!$is_free && in_array(1, $_SESSION['user_shifts']['filled']))) { $shifts_table[] = $shift_row; - $row_count++; $ical_shifts[] = $shift; } } diff --git a/includes/sys_lang.php b/includes/sys_lang.php index 40abf754..3a043614 100644 --- a/includes/sys_lang.php +++ b/includes/sys_lang.php @@ -23,11 +23,13 @@ function Get_Text($TextID, $NoError = false) { @ $Erg = mysql_query($SQL, $con); if (mysql_num_rows($Erg) == 1) - return (@ mysql_result($Erg, 0, "Text")); - elseif ($NoError && !$debug) return ""; - else { + return mysql_result($Erg, 0, "Text"); + elseif ($NoError && !$debug) + return ""; + elseif ($debug) return "Error Data, '$TextID' found " . mysql_num_rows($Erg) . "x"; - } + else + return $TextID; } function Print_Text($TextID, $NoError = false) { diff --git a/includes/sys_template.php b/includes/sys_template.php index 0f030e86..a120bb2d 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -233,4 +233,9 @@ function html_select_key($id, $name, $rows, $selected) { $html .= ''; return $html; } + +function img_button($link, $icon, $text, $extra_text = '') { + $translation = empty($text)? '' : Get_Text($text); + return '' . $translation . '' . (empty($extra_text)? '' : ' ' . $extra_text) . ''; +} ?> diff --git a/public/pic/icons/cross.png b/public/pic/icons/cross.png index 1514d51a3cf1b67e1c5b9ada36f1fd474e2d214a..9447309aef09692b92d57c2e8a88fcb857c7fcfa 100644 GIT binary patch literal 638 zcmV-^0)hRBP)n(Z#3}^nE0^I!(WK64V)MoXXJ+oTYqZ{l=W!N>(A(S4%_g+yjB1i#oF_aA z;Y3AF~f0Qqdz)l#*%?^|~17@#zuHJ}wlnnGlaeQ@cc=nV{j{qC(WLoP9uMRp$m8JJ&3`OSe_3^0xA`t zauSdd{ly|I+e#W^7kl2wj4^26y&p5q659{pL=igm8bqU^G!b)4$9YgWfp$GZyH-QK z(;BUOTV4hL-kzL_8Doj<`EbGjope7{om0UO1-oggcD}E`FAu;gmtprg$=dKp3;?z! z8sv@*7>!O^N9Sil8Ipy8FP{VeWEaK?tu$?!Jhz-60OK4+sX+kC%ou~Mo43Zf<1Etl zmewSL^4HHjsn*V(bB$81zA&`J#>Vy2tJNg{=r&~i%C+%dmoB?UHR{LEu)BKd%=lsL YHzurV(U6(=@Bjb+07*qoM6N<$f(-B;{{R30 literal 655 zcmV;A0&x9_P)uEoyT++I zn$b9r%cFfhHe2K68PkBu*@^<$y+7xQ$wJ~;c5aBx$R=xq*41Wo zhwQus_VOgm0hughj}MhOvs#{>Vg09Y8WxjWUJY5YW zJ?&8eG!59Cz=|E%Ns@013KLWOLV)CObIIj_5{>{#k%TEAMs_GbdDV`x-iYsGH z#=Z{USAQA>NY(}X7=3{K8#Gz zv2UAY5Qm@d^%o~LNoq>lC@u<4ol*&;3K)>mfe9uM11k%N0adcdM8+%``!_H!II0+! znPI3@6*Uq#;Lu>12&5_%ar5EWe(&x*1}6peC!Owwd+wzBUFPnbYiDO?KBe@fnXQ}I zMKi<9{x-9Fs(NQ*W8#K{4i-ZtJDKQ?8IXXI`*X#An?4!-i z&E02UyWO5Qvxm)Qb1lZm;o%{};Se(;&vTZRmH^n>+k0eYH@CL7MghRgZZ9t{uZalz z`}@BaMbQwEvWS$6qG)ux-M?at)a&&%Rc!&}0IIrPtyVcWI6y=`Xti2>{!@Q@d;8sf zzrWXLG*H#`|AUu92oyzus`hwJs@f9~LI{}IWq_>z!>4}l;0BMMRxmR@eEk6>7u*!r zX^0qK@4iJ!iKV$?-oN^QtpEKde)Y}UWCXHOg^UuU4Dva^!35KSq(evoz@xigkh>}1 z=#y{AXD^Xu^N?nsQUgzL`V>3)jX3&~q^DF?TX>w1yDB6HiwrtH62c4AUc1HNcX#k~ zg_U>SWAJN-I67vb@gnYqOC)y{aK}xk-FTHyz64pqCdN-sDy$HxHCGuAXK_6RPq;*a zi{Nfx!tu|$3_ABAC~2ISj3(fbLH8F1`+wl3kP(|VL#es|bMugwAt{^;7#$xW!-9pCMVy4|8R%}zzWf=L zS4w2%*{Ky_29iM>u`ntync&H$_fRG4e)YDy3NCVHxSWMP%a~0c!faY6<6o~;uz$|M Ro2~!=002ovPDHLkV1m4e|tv9>?g+k#9o0pTxd@;_sq{kwlU;^VvV*?BV8P@}BoaZTQUROpWV6|-M`|^n&)=+8tHo3*<<$NU zU`%V~ZF;?hBSYsjJ6%JzV}E(D{pOLqQklliUf9um_tGl-wty`y*p?eYNW56P>X@1s zZs7KrRZKtmV7Lqj^5Fgr7_`LjhdJK@ltF&O`j7?*NUM$KvmNGz)3WjM?V$vHlPT0AFyF?kLE<#HZabCSW3-oa*6;Z zrXD`Ulwd<^2glP%1Y1Kc1Ij%DU^=ME(jKf6APNlA$Uu;J4bVilQHSWX5uJ$9Zsp4M z0%!@LvyTxz=Z6stxlichODIY+yNGt%RM;m`>H4LOKLFs9Y%b5aUN|2|{0Zw|<_~i} fmXz*V19AKYadkWb2!P*^|{Swa$CLKTy39-L_{XUUOI%9TRToJ!E0S=5|e*rjUOk2~3@P~60A z-K%rmu597Uu;jWg=Cobtm_Y2RVeHST^5Mwx=DzdKZ}iWl^wg*H)Rq1}l<=psl5*5Xz9i;M}s*NP=ugs7Q#8Z;Dyx|}!`#}xw_C3!B-yaPC&0j)XcpuX@rNfq|q}N(wJOjA& z>u+z?dfJEuLePrqzy!)73pvLjxk4d6XNZt?hm_iYES{i}J5y3l?}PPNYDBR7oPc~6 zL^d)Bi4Q2L3pnp!nFxN9c2E+=@XAl&+;2m6a~kZj1r3Mz3C=hmUG<{+vWR@t4q?fJ zhFc(ozZD#Mx`^Q~g1v=K6!QnfuqyD4>U4EjF0eamL}Jx| z%&`kR-H+3GBYr*Qx}frLU4`%n9(`uSomzw)t%%NagXkA*R5Mbv9VLDp1wMo$cOMa~ s3Wm%r7^bwK$2$}-<~D8p`#1iScU4^XCLAA~0ssI207*qoM6N<$g3sK(Qvd(} diff --git a/public/pic/icons/tick.png b/public/pic/icons/tick.png index a9925a06ab02db30c1e7ead9c701c15bc63145cb..5a75e2f45302e28f29900ce717c4ad2959246dca 100644 GIT binary patch delta 523 zcmV+m0`&cv1eXMm7k>>11^@s6pu6rQ0005rNkl>R_xQRDw`Y3g@7U)WM3@AKU5X(5l^pZVHO7iuQ*Z!Fus7Nw1>d z;&$of-sgQ^7n@?O+CKZ|`Stmxq?Fi7ot!@EGDbgU&O8|hfPeH>;1dszxJFKQx>fzk z;GF}P03fy54Tc^ZcDq%>>9cG!S7P|}8XEQR@}?Rbzh88XobL2lyCER3=vC3Ehe%p1 z(>`JJMS0-t)8UczaA~UO>RoxqHZ73k`1r{~;5T?HPBJgY=i)Q~j6N^#C&s7MOzvKJ zX6XDXd~EWNtABTCj%}LYl4J1~%o3J;b#*=lfYiBXrw?-ClXl+h?cCOh1+T)1(FMk+ zVC1xmmSsaq4zKE?9)z42WnW)=8?O#YjXXY;5hR=14i&rf9z-imeEt3n9qA4jx(=BJ zK6^guK`4mv?QgEH!EFn}k4lQ*BGPuMDD?C~2#!QBKz{<&YJjC+Su#e-?8Lix{g2uf zN>fEekcc!@g=rQ*g2VS}SgI{cVx-L8cpqt7k!Fi3mH_9(=NFWmmn`d`R?0=!ZDpZuzl;s5{u N07*qoL~41^@s6AM^iV00004XF*Lt006JZHwB960000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzt4TybR5;7Mli4mqVHAaX=Q!_TZq*o5 zLaK&TC+g@aMJbINs;8}1t3yf*$E6r*j>Hs{AQG2a)rMyfFMpxB{FP|Jg%}bS|J}dV z-uv5Y3jhfI@&x~Gpk8a@TbAmbzcNs*Hu9!pJ^Bw=Ncbx5M+VAZ13!4wh1q*Iyf;?p zw$!Nb6xqHdR;);Q=}qk|Hjb`Z7oa7A;$lpnJC+?#L({H^XQP%0OTxMV1`uTS=76SJQPf zm84|_)GN&(u#&>jZ0bi*Ci|t!C&VDIo(s&`8Na#(0*lTc$;$YbYkUR1qNzMm3Ij+0 P0000