From c52b4c86d23551b743fa9549ffb2b5fa86b80837 Mon Sep 17 00:00:00 2001 From: Nael Date: Mon, 24 Feb 2014 15:27:55 +0100 Subject: [PATCH] stats voteweight, stats users, new style for vote.tpl --- uVote/api/votes/votes.php | 6 +++++ .../UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL.php | 11 +++++++++ uVote/dbd/qq/UVOTE_DATA_USER_COUNT_USERS.php | 11 +++++++++ uVote/img/frontend_logos/icon_bt.png | Bin 3606 -> 5932 bytes uVote/img/frontend_logos/icon_urn.png | Bin 0 -> 8095 bytes uVote/page/default_bulletin/bulletin.tpl | 5 +++- .../default_bulletin/default_bulletin.php | 7 ++++++ uVote/page/default_bulletin/voteweight.tpl | 4 ++++ uVote/page/default_page/vote.tpl | 22 ++++++++++-------- uVote/page/user_main_uVote/uVote.tpl | 9 +++++-- .../page/user_main_uVote/user_main_uVote.php | 7 ++++++ 11 files changed, 69 insertions(+), 13 deletions(-) create mode 100644 uVote/dbd/qq/UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL.php create mode 100644 uVote/dbd/qq/UVOTE_DATA_USER_COUNT_USERS.php create mode 100644 uVote/img/frontend_logos/icon_urn.png create mode 100644 uVote/page/default_bulletin/voteweight.tpl diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php index 97a464e..95fa84d 100644 --- a/uVote/api/votes/votes.php +++ b/uVote/api/votes/votes.php @@ -83,6 +83,12 @@ class votes { public static function get_bar_bt_per_poll($poll_ID){ return \DBD\UVOTE_DATA_BT_PER_POLL::Q1(array($poll_ID));} + public static function get_user_count(){ + return \DBD\UVOTE_DATA_USER_COUNT_USERS::Q1(array());} + + public static function get_count_user_votes_per_poll($poll_ID){ + return \DBD\UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL::Q1(array($poll_ID));} + public static function get_user_per_party_overall($user_ID){ return \DBD\UVOTE_DATA_USER_PER_PARTY_OVERALL::QA(array($user_ID)); } diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL.php new file mode 100644 index 0000000..a682924 --- /dev/null +++ b/uVote/dbd/qq/UVOTE_DATA_USER_COUNT_CHOICE_PER_POLL.php @@ -0,0 +1,11 @@ +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ⅆ#>SSQCYxa!o?d1tp!HmUg4>-1buw zbb)fx?6(M}Fg&;z;jKdBKINH9LkQ~1rEz%V(#$_1yib@E+5W41`(>DnoZPwHj@ZJ) zXr6x?7zeHsEIrUFb9XdH_4M^4o7eW*zt_evCY0hltI5XJlaZBo-XRuvX zO+}SZZRh2u`t@^QW$k}T!OmKgnl2WjSSjgyOYs>ucX>oJF}z^(<*@{Wz%#;2w(YhjHfb5dV1 zh2q^KBJ~fhQk>{}=uHbsjxytEbK>%i*`O)&S)VD9YMT%D2I_C1PVpv~%?Y73AX%?= z^n4%|^W0yY1LIPnj3<2fQEOtJ0^g@_0q{o2mcFEEkc-a;y%+6V*K{{D5$8*Z zZdLRv=zUN0z^FgDbryMGKAf*E+`0Z4hr>nTjyQy>uJ}KcNf=GI|KyKad;Kj0#nV)L ziUedOQ8N^UPVt|TBosg`+P5Y!LBCq(f}0myE8c=O1=*^G_i4e>uj9SNmg0QRy0cx) z=5iE;GG#qG&cLI}*aam(ABH?ZqWf>wFN7aA8}gVL1r=++osy`F@rwWQFPs#4p5?F^ zG+KRI=MBjCJdAYiVvSh*%xHIZuGL9j^u8AeOThF|JD?ARLI(>L~%EH74- z!SPxxwIh{($!v^im% zGnaB$zR>`UBP$zqt5Fny-E&}6v|XzCecHVPAXWp5yzfeW#tP?UbmVwXuZ+lC4aF#mCMzrh9|R_s-5v4rg=s*tODO zwDM%(Rm(xcL0pIW7(qut429h)}_No zHY4|)M?+i9<_a@2GY!Ck#1S2?_WBy_WXc!t*x1of&V3oTwU*VQFCIUx0xhkG1r^W@ zt;y6Pxb|BTX=Nx)UblmpXDzp2C|1!_WAMRQ{ggmkw$WeMI%jnmPb1dw@GP%EB6YBa zV|4Xrf4`cPNV=S-k*K=5bPC2HG$#?pX$gD>tg6CKpOsFL_vz2Zu8fV1A!;~VU$AW^ zs7yUPn^%S0*yt>QeWutH=;h`0HFTN{LQk-(+_050d(l!eSq6lpA!41?rB5sO?jWsD zVxf1#u|>8`Azog}Ps&*Vb}HXrUwh#FcBn~sEPrk@`i#{De>_klPI&4rrezW=gFN;G zwxhMKTB}z3M%RA&JbwoyHHn%7MDo_kueT(^z*l_W)sUK!XT39~4<76$&R70fo`-Nv zCgJ4AS5qZ7hu^C1$|T*NIs=atjeg#xNW9ej+uG$A&eZ*6p~$jzhGV^2(l>Po@n&nZ zM3V%y{H)p`&m9f8P1z)QIo&~aB$OR%$*m+& z%7LH$-$p>o9n=EU9DO&VVvI>C_NcRLcl#KV%pIg=OZ^wxFJ8QGqH{Ja%+1Y#SA?8K zT;u!q32El+`=0%;fnEPM4m(%;VNn?}c$?X%-zSp_>TjVU<1nbX1{3SZLLJE_GZbEm z@W%{Nq8apUE~w`7*#Uhe_Fb>x*ld^o5*lP?0d&3^JPT5ycRSW3BjkbQfe_go73Tl< z7wqMGC>Qjmpz_eWu#89Z&y+iQ;WNuyTU!MTf3i;*#zR(ioBFdETY%_R0tQKBxEoBz97~I@x3HzOz`VfCs9(*&@;$AZ* z){?0Q%EGB?JZQQ!;ltJ*nyd=fi910d0+H7>voKC{>(5%z%0f&8ET8a$sPzD9bt~g> zyqxWk_!)S{^?qY$po-NMDRes;B1dwCT($Q?lt!1F}w7@1&+ s?)?x~Z8cJ4{PJ**`ajzkLz>?W$_ihKP31M<5PPyhe` diff --git a/uVote/img/frontend_logos/icon_urn.png b/uVote/img/frontend_logos/icon_urn.png new file mode 100644 index 0000000000000000000000000000000000000000..f68e86c64a10cb0403f894057182afe19684d4d5 GIT binary patch literal 8095 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 ${bars_user} +
+ ${voice_weight} +

Ergebnis Bundestag

${bars_bt} @@ -16,6 +19,6 @@
${vote_buttons}
-
+ \ No newline at end of file diff --git a/uVote/page/default_bulletin/default_bulletin.php b/uVote/page/default_bulletin/default_bulletin.php index 57f0d4d..3a8fea8 100644 --- a/uVote/page/default_bulletin/default_bulletin.php +++ b/uVote/page/default_bulletin/default_bulletin.php @@ -38,6 +38,12 @@ class default_bulletin extends SYSTEM\PAGE\Page { return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/table_bt.tpl'), $vars); } + private function voice_weight(){ + $vars = votes::get_count_user_votes_per_poll($this->poll_ID); + $vars['voteweight'] = 1/$vars['count']*100; + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/voteweight.tpl'), $vars);; + } + private function vote_buttons($poll_expired){ $user_poll = votes::getUserPollData($this->poll_ID); if($poll_expired){ @@ -105,6 +111,7 @@ class default_bulletin extends SYSTEM\PAGE\Page { $vars['css'] = $this->css(); $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; $vars ['vote_buttons'] = $this->vote_buttons($poll_expired); + $vars['voice_weight'] = $this->voice_weight(); $vars['poll_ID'] = $this->poll_ID; $vars = array_merge($vars,votes::get_voteinfo($this->poll_ID)); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/bulletin.tpl'),$vars); diff --git a/uVote/page/default_bulletin/voteweight.tpl b/uVote/page/default_bulletin/voteweight.tpl new file mode 100644 index 0000000..fc5d06f --- /dev/null +++ b/uVote/page/default_bulletin/voteweight.tpl @@ -0,0 +1,4 @@ +
+ Dein aktuelles Stimmgewicht bei dieser Abstimmung: + ${voteweight}% +
\ No newline at end of file diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl index 256620c..b03f632 100644 --- a/uVote/page/default_page/vote.tpl +++ b/uVote/page/default_page/vote.tpl @@ -1,25 +1,27 @@ - + + - - +
+

${title}

- Nr.${ID} - ${full_vote_btn} + ${full_vote_btn}
+ ${cdu}
${csu}
${spd}
${gruene}
${linke}
- uv - ${uv_pro} - ${uv_con} - ${uv_ent} - + + + ${uv_pro} + ${uv_con} + ${uv_ent} + diff --git a/uVote/page/user_main_uVote/uVote.tpl b/uVote/page/user_main_uVote/uVote.tpl index 6dbed93..fcda0fd 100644 --- a/uVote/page/user_main_uVote/uVote.tpl +++ b/uVote/page/user_main_uVote/uVote.tpl @@ -15,5 +15,10 @@ Wie oft der Bundestag
Dafür, Dagegen oder -
Enthaltung gestimmt hat.
- \ No newline at end of file +
Enthaltung gestimmt hat. + +
+
+
+ ${user_count} Nutzer auf uVote +
\ No newline at end of file diff --git a/uVote/page/user_main_uVote/user_main_uVote.php b/uVote/page/user_main_uVote/user_main_uVote.php index 237db0e..3abb4c2 100644 --- a/uVote/page/user_main_uVote/user_main_uVote.php +++ b/uVote/page/user_main_uVote/user_main_uVote.php @@ -46,10 +46,17 @@ class user_main_uVote extends SYSTEM\PAGE\Page { return $result; } + private function user_count(){ + $vars = votes::get_user_count(); + return $vars['count']; + } + + public function html(){ $vars = array(); $vars['votes_all'] = $this->votes_all(); $vars['votes_all_bt'] = $this->votes_all_bt(); + $vars['user_count'] = $this->user_count(); $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); $vars = array_merge($vars, \SYSTEM\locale::getStrings(150)); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_uVote/uVote.tpl'),$vars);