webcraftmedia/u-vote.eu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new sql fixes

Browse Source 
htaccess added
This commit is contained in:
Naeltard 2015-10-25 01:51:25 +02:00
parent 218f2a63eb
commit 1ff201327a
7 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.htaccess Normal file
View File

@ -0,0 +1,3 @@
RewriteEngine On
RewriteCond %{HTTP_HOST} !^www\.u-vote\.eu$ [NC]
RewriteRule ^(.*)$ http://www.u-vote.eu/$1 [R=301,L]

12
uvote/api/votes/bars.php
View File

@ -12,18 +12,18 @@ class bars{
public static function get_uvote_choice_overall(){
$vars = \SQL\UVOTE_DATA_CHOICE_OVERALL::Q1(array());
$vars['total_total'] = $vars['pro'] + $vars['con'] + $vars['ent'];
$vars['total_pro_percentage'] = round($vars['pro']/$vars['total_total']*100+1);
$vars['total_con_percentage'] = round($vars['con']/$vars['total_total']*100+1);
$vars['total_ent_percentage'] = round($vars['ent']/$vars['total_total']*100+1);
$vars['total_pro_percentage'] = $vars['total_total'] > 0 ? round($vars['pro']/$vars['total_total']*100+1) : 0;
$vars['total_con_percentage'] = $vars['total_total'] > 0 ? round($vars['con']/$vars['total_total']*100+1) : 0;
$vars['total_ent_percentage'] = $vars['total_total'] > 0 ? round($vars['ent']/$vars['total_total']*100+1) : 0;
new SYSTEM\LOG\INFO($vars['total_ent_percentage']);
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/uvote_total.tpl'),$vars);
}
public static function get_bt_choice_overall(){
$vars = \SQL\UVOTE_DATA_CHOICE_BT_OVERALL::Q1(array());
$vars['total_total'] = $vars['pro'] + $vars['con'] + $vars['ent'];
$vars['total_pro_percentage'] = round($vars['pro']/$vars['total_total']*100+1);
$vars['total_con_percentage'] = round($vars['con']/$vars['total_total']*100+1);
$vars['total_ent_percentage'] = round($vars['ent']/$vars['total_total']*100+1);
$vars['total_pro_percentage'] = $vars['total_total'] > 0 ? round($vars['pro']/$vars['total_total']*100+1) : 0;
$vars['total_con_percentage'] = $vars['total_total'] > 0 ? round($vars['con']/$vars['total_total']*100+1) : 0;
$vars['total_ent_percentage'] = $vars['total_total'] > 0 ? round($vars['ent']/$vars['total_total']*100+1) : 0;
new SYSTEM\LOG\INFO($vars['total_ent_percentage']);
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/bt_total.tpl'),$vars);
}

3
uvote/page/default_register/tpl/register.tpl
View File

@ -84,7 +84,8 @@
</tr>
</tbody>
</table>
<button class="btn btn-primary" type="submit"><i class="glyphicon glyphicon-play-circle"></i> ${register}</button>
<button class="btn btn-primary" type="submit"><i class="glyphicon glyphicon-play-circle"></i> ${register}</button>
<div style="display: none" id="help-block-user-password-combi-wrong">Registrierung Fehlgeschlagen</div>
</div>
</form>
</div>

0
uvote/sql/mysql/system.api.sql → uvote/sql/mysql/system_api.sql
View File

1
uvote/sql/mysql/system_text.sql
View File

@ -94,7 +94,6 @@ INSERT INTO `system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('Beta-News-1', 'news');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('analysis_help_basic_stats', 'domestic');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('ari_mail', 'uvote');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('ari_name', 'uvote');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('ari_pass', 'uvote');

1
uvote/sql/mysql/uvote_votes_per_party.sql
View File

@ -1,3 +1,4 @@
DELETE FROM `uvote_votes_per_party`;
INSERT INTO `uvote_votes_per_party` (`poll_ID`, `party`, `votes_pro`, `votes_contra`, `nr_attending`, `total`, `choice`, `bt_choice`) VALUES (32, 'cdu', 248, 0, 254, 255, 1, 0);
INSERT INTO `uvote_votes_per_party` (`poll_ID`, `party`, `votes_pro`, `votes_contra`, `nr_attending`, `total`, `choice`, `bt_choice`) VALUES (32, 'csu', 53, 0, 56, 56, 1, 0);
INSERT INTO `uvote_votes_per_party` (`poll_ID`, `party`, `votes_pro`, `votes_contra`, `nr_attending`, `total`, `choice`, `bt_choice`) VALUES (32, 'gruene', 1, 10, 59, 63, 2, 0);

1
uvote/sql/mysql/uvote_votes_tag.sql
View File

@ -1,3 +1,4 @@
DELETE FROM `uvote_votes_tag`;
INSERT INTO `uvote_votes_tag` (`poll_ID`, `tag`, `group`) VALUES (32, 'Innenpolitik', 1);
INSERT INTO `uvote_votes_tag` (`poll_ID`, `tag`, `group`) VALUES (32, 'Asylpolitik', 1);
INSERT INTO `uvote_votes_tag` (`poll_ID`, `tag`, `group`) VALUES (33, 'Innenpolitik', 1);