From 2a134e6c0b8e7c5bbeade38d29052194bd9dfa46 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 17 Sep 2018 12:33:15 +0200 Subject: [PATCH] Config: Removed nightshifts query --- config/config.default.php | 26 +++++--------- includes/model/Stats.php | 10 ++++-- includes/model/User_model.php | 34 ++++++++++++++++-- includes/pages/admin_active.php | 2 +- includes/view/User_view.php | 9 +++-- .../lang/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 45036 -> 45040 bytes .../lang/de_DE.UTF-8/LC_MESSAGES/default.po | 7 ++-- .../lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo | Bin 41265 -> 41310 bytes .../lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po | 7 ++-- 9 files changed, 63 insertions(+), 32 deletions(-) diff --git a/config/config.default.php b/config/config.default.php index f80b54e1..dfccab0a 100644 --- a/config/config.default.php +++ b/config/config.default.php @@ -79,23 +79,13 @@ return [ // local timezone 'timezone' => env('TIMEZONE', 'Europe/Berlin'), - // weigh every shift the same - //'shift_sum_formula' => 'SUM(`end` - `start`)', - // Multiply 'night shifts' and freeloaded shifts (start or end between 2 and 6 exclusive) by 2 - 'shift_sum_formula' => ' - SUM( - (1 + - ( - (HOUR(FROM_UNIXTIME(`Shifts`.`end`)) > 2 AND HOUR(FROM_UNIXTIME(`Shifts`.`end`)) < 6) - OR (HOUR(FROM_UNIXTIME(`Shifts`.`start`)) > 2 AND HOUR(FROM_UNIXTIME(`Shifts`.`start`)) < 6) - OR (HOUR(FROM_UNIXTIME(`Shifts`.`start`)) <= 2 AND HOUR(FROM_UNIXTIME(`Shifts`.`end`)) >= 6) - ) - ) - * (`Shifts`.`end` - `Shifts`.`start`) - * (1 - 3 * `ShiftEntry`.`freeloaded`) - ) - ', + 'night_shifts' => [ + 'enabled' => true, // Disable to weigh every shift the same + 'start' => 2, + 'end' => 6, + 'multiplier' => 2, + ], // Voucher calculation 'voucher_settings' => [ @@ -109,10 +99,10 @@ return [ 'en_US.UTF-8' => 'English', ], - 'default_locale' => env('DEFAULT_LOCALE', 'en_US.UTF-8'), + 'default_locale' => env('DEFAULT_LOCALE', 'en_US.UTF-8'), // Available T-Shirt sizes, set value to null if not available - 'tshirt_sizes' => [ + 'tshirt_sizes' => [ 'S' => 'S', 'S-G' => 'S Girl', 'M' => 'M', diff --git a/includes/model/Stats.php b/includes/model/Stats.php index 20376ac6..c8342d82 100644 --- a/includes/model/Stats.php +++ b/includes/model/Stats.php @@ -128,17 +128,21 @@ function stats_angels_needed_three_hours() } /** - * Returns the number of needed angels for nightshifts (between 2 and 8) + * Returns the number of needed angels for nightshifts (see config) * * @return int|string */ function stats_angels_needed_for_nightshifts() { + $nightShiftsConfig = config('night_shifts'); + $nightStartTime = $nightShiftsConfig['start']; + $nightEndTime = $nightShiftsConfig['end']; + $night_start = parse_date( 'Y-m-d H:i', - date('Y-m-d', time() + 12 * 60 * 60) . ' 02:00' + date('Y-m-d', time() + 12 * 60 * 60) . ' ' . $nightStartTime . ':00' ); - $night_end = $night_start + 6 * 60 * 60; + $night_end = $night_start + ($nightEndTime - $nightStartTime) * 60 * 60; $result = Db::selectOne(" SELECT SUM(`count`) AS `count` FROM ( SELECT diff --git a/includes/model/User_model.php b/includes/model/User_model.php index cbdb5efe..092ddf27 100644 --- a/includes/model/User_model.php +++ b/includes/model/User_model.php @@ -26,8 +26,7 @@ function User_delete($user_id) */ function User_tshirt_score($user) { - $shift_sum_formula = config('shift_sum_formula'); - + $shift_sum_formula = User_get_shifts_sum_query(); $result_shifts = DB::selectOne(' SELECT ROUND((' . $shift_sum_formula . ') / 3600, 2) AS `tshirt_score` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` @@ -530,3 +529,34 @@ function User_get_eligable_voucher_count(&$user) return $eligable_vouchers; } + +/** + * Generates the query to sum night shifts + * + * @return string + */ +function User_get_shifts_sum_query() +{ + $nightShifts = config('night_shifts'); + if (!$nightShifts['enabled']) { + return 'SUM(`end` - `start`)'; + } + + return sprintf(' + SUM( + (1 + + ( + (HOUR(FROM_UNIXTIME(`Shifts`.`end`)) > %1$d AND HOUR(FROM_UNIXTIME(`Shifts`.`end`)) < %2$d) + OR (HOUR(FROM_UNIXTIME(`Shifts`.`start`)) > %1$d AND HOUR(FROM_UNIXTIME(`Shifts`.`start`)) < %2$d) + OR (HOUR(FROM_UNIXTIME(`Shifts`.`start`)) <= %1$d AND HOUR(FROM_UNIXTIME(`Shifts`.`end`)) >= %2$d) + ) + ) + * (`Shifts`.`end` - `Shifts`.`start`) + * (1 - (%3$d + 1) * `ShiftEntry`.`freeloaded`) + ) + ', + $nightShifts['start'], + $nightShifts['end'], + $nightShifts['multiplier'] + ); +} diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 7aeb249f..3a9ba8c4 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -16,7 +16,7 @@ function admin_active_title() function admin_active() { $tshirt_sizes = config('tshirt_sizes'); - $shift_sum_formula = config('shift_sum_formula'); + $shift_sum_formula = User_get_shifts_sum_query(); $request = request(); $msg = ''; diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 40e7bfe1..3d5cfd69 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -532,6 +532,7 @@ function User_view( $admin_user_worklog_privilege, $user_worklogs ) { + $nightShiftsConfig = config('night_shifts'); $user_name = htmlspecialchars($user_source['Vorname']) . ' ' . htmlspecialchars($user_source['Name']); $myshifts_table = ''; if ($its_me || $admin_user_privilege) { @@ -619,8 +620,12 @@ function User_view( ]), ($its_me || $admin_user_privilege) ? '

' . __('Shifts') . '

' : '', $myshifts_table, - $its_me ? info( - glyph('info-sign') . __('Your night shifts between 2 and 8 am count twice.'), + ($its_me && $nightShiftsConfig['enabled']) ? info( + glyph('info-sign') . sprintf( + __('Your night shifts between %d and %d am count twice.'), + $nightShiftsConfig['start'], + $nightShiftsConfig['end'] + ), true ) : '', $its_me && count($shifts) == 0 diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo index a5cbb44f1248f31f42ded4bced1908ecd37d758b..4909145a1c03795ce7c4d8cbbd34f4581c34b8ff 100644 GIT binary patch delta 5103 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 delta 5099 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 JtOM)){|`lx_wWD! diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po index f3c6a768..54e819c8 100644 --- a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" "POT-Creation-Date: 2017-12-29 19:01+0100\n" -"PO-Revision-Date: 2018-08-27 22:26+0200\n" +"PO-Revision-Date: 2018-09-17 12:10+0200\n" "Last-Translator: msquare \n" "Language-Team: \n" "Language: de_DE\n" @@ -2768,8 +2768,9 @@ msgid "JSON Export" msgstr "JSON Export" #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:598 -msgid "Your night shifts between 2 and 8 am count twice." -msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt." +#, php-format +msgid "Your night shifts between %d and %d am count twice." +msgstr "Deine Nachtschichten zwischen %d und %d Uhr zählen doppelt." #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:603 #, php-format diff --git a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo index 576ea202b9dca6c1237f931c2e28b1de85027b67..5ad4898481d3255aaca4b2c5f77826050779908a 100644 GIT binary patch delta 5316 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 *nLBV6RH43$r8CZ$~F$-%j0~@eErjIcu6&GN4 ztVH#@iQ1W9qE-cJ*H9}PfXbD8Y>eYjxiA$Kz`_^L9b>jq&>3$>1#kp4a20BRvu^!7Y6q^l zbu-TP3qy9)KotQ z48^^uojZ;vJ&ZYlN~)O?*cIG~8n+tN|GMjUm`45I=%i3cm}pFE?B`m7t*GyG{S38r z_gw#r8rXl5FTcl)LSF(U1Cv7=_0sasIIsYG`PNb(nw+*aG7U zjLF0t)PTjV^IS_&fhxCu3ICF+b%VH|#eO7h33><=ik*EF$^{g0-h8x7jJVb}(j zpbs8Kt>8Fn;IkNyU%Bm1QAguF*(PBSDxemq??5IhuwS9(8G((k7?l(A9SVA3E&Ad% z)J{~QKA9)54_-tC6gb5`4?_i(f=afIsQx`sw_zwQ!~)cNwWuBV0UKijY9WpfUk448 zgo-c=Q?Ng3z}cuT)^ha2lc*I`qqg!gX5bxE|4_b4T2M>WxLK%xUO_D^7yWQDdh7nr zvIR2_HNacwh3ilgZA88B9%==ZsEJRaCccI`8uO;ziD=Y9lCe4FU@GR}D_DkUSdHD8 z-#ny{Ohf8)I^iJfj0aI${|&ansEHR9+m$cIVCuV3*XsysrI%5GT|)(Q1GOV} zF%aufAD~}Q$rw7zwnxrl|GU$WM1wz$b)AM9U@m&1gNk?=4#5i48P;JF3@fn{B%&oLvRre#kH7#H&IFbtc3mVL?LUoJ>$u!6}{`a6_cp%#8>egDi?g_*nrY;D)pXt z1rMRF*TT8>te0V1>K~zw_$F#c9%CVTIP>h;OhHY&6hm<}`r>vB!hNWf9d$j0+RF2& z_i9i_b=_^h;kN%BwFBR})}sRSoNvc-0w`#JaMXmcZaoRru?=eCj@SxcLG>#@o%sw5 zz!JB<7{jQSxmI9P>IX3bKS90sIkHg4d~FNnK5C$6r~&*I*p*Os)QU%;l5+-j!NsT}JAsjS8Y6W7Kc}FT+(&J>dCRWI50!i|7>zx# zIp(1To{NdN5ueKfYFz6CYT8BD;h(21q+Glgy#@wQ#r5Pb24!z|j@ zqO$)qY9h1PnBLF{hvEXv#Tv}OI98>d8;HvOQf!ZhFcWW~<_%uL{x7A_W{ENH;1Snu zG%DFHU_3rRO&GAu{x}W7PSoe220Dxi_%iBKUWX|dRA!H~6Dp7ir~o&jz8{~K5s4_gNwJB-Sa)2MrX33a45TyLXtr4E(U z^^RL;Kn2ifr9GoKe2ID&RCd3CihL?+#oJIxb^=>s4Qir?I31rLn_wocvH|^w-qh<+ z<2^+M?D&!DiYOX=Fv&Fym1LQy7kXhM9ELBF(5=r!t+W)Qa1F-bKGXzfP}zP3HQtY? zqk4)2?wIg3wqsY+iuz$Vjz-;z64VQ;P!oNC`VJgNUAGIU0RM^#@CUd405#ro)OcZQ zZU0o%0y<;7?*C8<`c*4Nz2Km(NjWO=Bj|@0&=;?|eu<5#*Sht)=uiD8)K2~n_1uHZ zR=Yo{9*!C>9(yytNu{8H-$b45Y*Zi{U4M&3)K6juOj&2mM}hdT+2VG{r>fV^I^8A;)GeU_K7o$VUkeAy?nr zN1gq&O?HBnm`VK;)RsR&C86JDn=8Sa*?+A(g$8X+25Nw=sP^Hg07hdNF2N8iM+Lgy z^*CzF&tYr4h??-9sQ!WF_DEw<^K?e-bWS<@uL(!fkcJB|4ELk5`2;E#uA-9b9~gi? zp#p5c-sruB;IJ8}&ikh+4q!914p340_>tY=W0C7r(~7m|kK3 zATbAZrq$R78^34&a4`^UsT;mc*o0=+f|e_$n#r|@-s<=9_y=;lQ(#IJS_i1Y8TJXJjx%X zo}x$9q1Jy&^_ep>VM0OGoZO`WzU>pn7fnj&TJ?NPt!JaQxdrp4&MyCcTta#J_>aBY Zx65o-^_+XUBoxr8$L>V0{{xo*^rrv- diff --git a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po index f49f6333..19b08ad7 100644 --- a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po +++ b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" "POT-Creation-Date: 2017-04-25 05:23+0200\n" -"PO-Revision-Date: 2017-04-25 05:23+0200\n" +"PO-Revision-Date: 2018-09-17 12:11+0200\n" "Last-Translator: samba \n" "Language-Team: \n" "Language: pt_BR\n" @@ -2385,8 +2385,9 @@ msgid "Action" msgstr "Ação" #: includes/view/User_view.php:373 -msgid "Your night shifts between 2 and 8 am count twice." -msgstr "Os seus turnos noturnos entre 2h e 8h contam como dois." +#, php-format +msgid "Your night shifts between %d and %d am count twice." +msgstr "Os seus turnos noturnos entre %dh e %dh contam como dois." #: includes/view/User_view.php:374 #, php-format