From 1a315d70c719ae7cf3554ecb27178a164189ecc8 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 23 May 2018 14:39:30 +0200 Subject: [PATCH] saimod beta checkboxes, fixed typo engeneering -> engineering --- democracy/page/autoload.inc | 2 +- .../default_donate/tpl/default_donate.tpl | 2 +- .../default_engeneering.php | 16 -- .../css/default_engineering.css} | 0 .../default_engineering.php | 16 ++ .../js/default_engineering.js} | 4 +- .../tpl/default_engineering.tpl} | 0 democracy/page/default_faq/default_faq.php | 2 +- democracy/page/default_page/default_page.php | 4 +- .../page/default_page/tpl/default_page.tpl | 4 +- democracy/page/page_democracy.php | 4 +- democracy/sai/saimod_beta/js/saimod_beta.js | 156 ++++++++++++------ democracy/sai/saimod_beta/saimod_beta.php | 71 ++------ .../sai/saimod_beta/sql/mysql/system_api.sql | 8 +- democracy/sai/saimod_beta/tpl/all.tpl | 4 +- democracy/sai/saimod_beta/tpl/all_tr.tpl | 4 +- democracy/sai/saimod_beta/tpl/code_tr.tpl | 4 +- democracy/sai/saimod_beta/tpl/mail.tpl.old | 17 -- democracy/sai/saimod_beta/tpl/mail_tr.tpl.old | 13 -- .../sai/saimod_beta/tpl/store_android.tpl | 5 +- .../sai/saimod_beta/tpl/store_android_tr.tpl | 5 +- democracy/sai/saimod_beta/tpl/store_ios.tpl | 5 +- .../sai/saimod_beta/tpl/store_ios_tr.tpl | 5 +- democracy/sql/mysql/system_page.sql | 2 +- 24 files changed, 167 insertions(+), 186 deletions(-) delete mode 100644 democracy/page/default_engeneering/default_engeneering.php rename democracy/page/{default_engeneering/css/default_engeneering.css => default_engineering/css/default_engineering.css} (100%) create mode 100644 democracy/page/default_engineering/default_engineering.php rename democracy/page/{default_engeneering/js/default_engeneering.js => default_engineering/js/default_engineering.js} (98%) rename democracy/page/{default_engeneering/tpl/default_engeneering.tpl => default_engineering/tpl/default_engineering.tpl} (100%) delete mode 100644 democracy/sai/saimod_beta/tpl/mail.tpl.old delete mode 100644 democracy/sai/saimod_beta/tpl/mail_tr.tpl.old diff --git a/democracy/page/autoload.inc b/democracy/page/autoload.inc index 9564cd7..12fd6d4 100644 --- a/democracy/page/autoload.inc +++ b/democracy/page/autoload.inc @@ -4,7 +4,7 @@ \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_home'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_citizen'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_politicians'); -\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_engeneering'); +\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_engineering'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_donate'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_datenschutz'); diff --git a/democracy/page/default_donate/tpl/default_donate.tpl b/democracy/page/default_donate/tpl/default_donate.tpl index 7eed612..b2e6896 100644 --- a/democracy/page/default_donate/tpl/default_donate.tpl +++ b/democracy/page/default_donate/tpl/default_donate.tpl @@ -95,7 +95,7 @@ Spenden und Daueraufträge sind nur eine Möglichkeit, uns zu unterstützen. Wir suchen ständig motivierte Leute für die aktive Mitarbeit in unserem Projekt! Du hast Interesse Deine Fähigkeiten einzubringen – wir freuen uns - über Anregungen, Fragen und Kritik. Als Freiwilliger melden. + über Anregungen, Fragen und Kritik. Als Freiwilliger melden.
@@ -111,7 +111,7 @@

IN TOUCH

diff --git a/democracy/page/page_democracy.php b/democracy/page/page_democracy.php index 4021f29..b880185 100644 --- a/democracy/page/page_democracy.php +++ b/democracy/page/page_democracy.php @@ -17,8 +17,8 @@ class page_democracy extends \SYSTEM\API\api_default { return (new default_citizen())->html();} public static function page_politicians(){ return (new default_politicians())->html();} - public static function page_engeneering(){ - return (new default_engeneering())->html();} + public static function page_engineering(){ + return (new default_engineering())->html();} public static function page_donate(){ return (new default_donate())->html();} diff --git a/democracy/sai/saimod_beta/js/saimod_beta.js b/democracy/sai/saimod_beta/js/saimod_beta.js index 24b456a..2bb2340 100644 --- a/democracy/sai/saimod_beta/js/saimod_beta.js +++ b/democracy/sai/saimod_beta/js/saimod_beta.js @@ -3,7 +3,31 @@ function init_saimod_beta_all() { $('#tabs_beta li a').each(function(){ $(this).removeClass('active');}); $('#menu_tag_beta').addClass('active'); - email_delete(); + $('.email_delete').click(function(){ + var emails = []; + $('.all-check:checked').each(function() { + emails.push($(this).attr('email')); + }); + if (confirm('Are you sure you want to delete '+emails.length+' Users PERMANENTLY?')) { + $.ajax({ + async: true, + url: this.endpoint, + type: 'GET', + dataType: 'JSON', + data: { + sai_mod: '.SAI.saimod_beta', + action: 'email_delete', + emails: emails + }, + success: function(){ + system.reload(); + }, + error: function(){ + alert('Something happend - try again!'); + } + }); + } + }); }; function init_saimod_beta_code() { @@ -85,9 +109,10 @@ function init_saimod_beta_store_android() { $(this).removeClass('active');}); $('#menu_tag_store_android').addClass('active'); $('.code_android').click(function(){ - var email = $(this).attr('email'); - var android = $(this).attr('android'); - var ios = $(this).attr('ios'); + var emails = []; + $('.android-check:checked').each(function() { + emails.push($(this).attr('email')); + }); $.ajax({ async: true, url: this.endpoint, @@ -96,9 +121,9 @@ function init_saimod_beta_store_android() { data: { sai_mod: '.SAI.saimod_beta', action: 'store', - email: email, - android: android, - ios: ios + emails: emails, + android: 1, + ios: 0 }, success: function(){ system.reload(); @@ -116,51 +141,12 @@ function init_saimod_beta_store_android() { document.execCommand("copy"); $temp.remove(); }); - email_delete(); -}; -function init_saimod_beta_store_ios() { - $("#table_beta_store_ios").tablesorter(); - $('#tabs_beta li a').each(function(){ - $(this).removeClass('active');}); - $('#menu_tag_store_ios').addClass('active'); - $('.code_ios').click(function(){ - var email = $(this).attr('email'); - var android = $(this).attr('android'); - var ios = $(this).attr('ios'); - $.ajax({ - async: true, - url: this.endpoint, - type: 'GET', - dataType: 'JSON', - data: { - sai_mod: '.SAI.saimod_beta', - action: 'store', - email: email, - android: android, - ios: ios - }, - success: function(){ - system.reload(); - }, - error: function(){ - alert('Something happend - try again!'); - } - }); - }); - $('.copy_email').click(function(){ - var i = $(this).attr('i'); - var $temp = $(""); - $("body").append($temp); - $temp.val($('#email_'+i).text()).select(); - document.execCommand("copy"); - $temp.remove(); - }); - email_delete(); -}; -function email_delete(){ $('.email_delete').click(function(){ - if (confirm('Are you sure you want to delete this user PERMANENTLY?')) { - var email = $(this).attr('email'); + var emails = []; + $('.android-check:checked').each(function() { + emails.push($(this).attr('email')); + }); + if (confirm('Are you sure you want to delete '+emails.length+' Users PERMANENTLY?')) { $.ajax({ async: true, url: this.endpoint, @@ -169,7 +155,7 @@ function email_delete(){ data: { sai_mod: '.SAI.saimod_beta', action: 'email_delete', - email: email + emails: emails }, success: function(){ system.reload(); @@ -180,4 +166,68 @@ function email_delete(){ }); } }); -} \ No newline at end of file +}; +function init_saimod_beta_store_ios() { + $("#table_beta_store_ios").tablesorter(); + $('#tabs_beta li a').each(function(){ + $(this).removeClass('active');}); + $('#menu_tag_store_ios').addClass('active'); + $('.code_ios').click(function(){ + var emails = []; + $('.ios-check:checked').each(function() { + emails.push($(this).attr('email')); + }); + $.ajax({ + async: true, + url: this.endpoint, + type: 'GET', + dataType: 'JSON', + data: { + sai_mod: '.SAI.saimod_beta', + action: 'store', + emails: emails, + android: 0, + ios: 1 + }, + success: function(){ + system.reload(); + }, + error: function(){ + alert('Something happend - try again!'); + } + }); + }); + $('.copy_email').click(function(){ + var i = $(this).attr('i'); + var $temp = $(""); + $("body").append($temp); + $temp.val($('#email_'+i).text()).select(); + document.execCommand("copy"); + $temp.remove(); + }); + $('.email_delete').click(function(){ + var emails = []; + $('.ios-check:checked').each(function() { + emails.push($(this).attr('email')); + }); + if (confirm('Are you sure you want to delete '+emails.length+' Users PERMANENTLY?')) { + $.ajax({ + async: true, + url: this.endpoint, + type: 'GET', + dataType: 'JSON', + data: { + sai_mod: '.SAI.saimod_beta', + action: 'email_delete', + emails: emails + }, + success: function(){ + system.reload(); + }, + error: function(){ + alert('Something happend - try again!'); + } + }); + } + }); +}; \ No newline at end of file diff --git a/democracy/sai/saimod_beta/saimod_beta.php b/democracy/sai/saimod_beta/saimod_beta.php index 0b2fe7d..cb59ba2 100644 --- a/democracy/sai/saimod_beta/saimod_beta.php +++ b/democracy/sai/saimod_beta/saimod_beta.php @@ -88,8 +88,10 @@ class saimod_beta extends \SYSTEM\SAI\sai_module{ return \JsonResult::ok(); } - public static function sai_mod__SAI_saimod_beta_action_email_delete($email){ - \SQL\BETA_EMAIL_DELETE::QI(array($email)); + public static function sai_mod__SAI_saimod_beta_action_email_delete($emails){ + foreach($emails as $email){ + \SQL\BETA_EMAIL_DELETE::QI(array($email)); + } return \JsonResult::ok(); } @@ -100,6 +102,7 @@ class saimod_beta extends \SYSTEM\SAI\sai_module{ $beta = \SQL\BETA_STORE_ANDROID_FIND::QQ(); $i = 0; while($row = $beta->next()){ + $row['tr_class'] = 'table-warning'; $row['i'] = $i++; if($row['android']){ $row['device'] = 'android';} @@ -116,11 +119,10 @@ class saimod_beta extends \SYSTEM\SAI\sai_module{ if($row['storedAt']){ $row['stored'] = 'check'; $row['stored_time'] = \SYSTEM\time::time_ago_string(strtotime($row['storedAt'])); - $row['disabled'] = 'disabled'; + $row['tr_class'] = 'table-success'; } else { $row['stored'] = 'times'; $row['stored_time'] = ''; - $row['disabled'] = ''; } $row['used_code'] = $row['used_code'] == '' ? 'invalid' : $row['used_code']; if($row['used_code'] == $row['code']){ @@ -141,6 +143,7 @@ class saimod_beta extends \SYSTEM\SAI\sai_module{ $beta = \SQL\BETA_STORE_IOS_FIND::QQ(); $i = 0; while($row = $beta->next()){ + $row['tr_class'] = 'table-warning'; $row['i'] = $i++; if($row['android']){ $row['device'] = 'android';} @@ -157,11 +160,10 @@ class saimod_beta extends \SYSTEM\SAI\sai_module{ if($row['storedAt']){ $row['stored'] = 'check'; $row['stored_time'] = \SYSTEM\time::time_ago_string(strtotime($row['storedAt'])); - $row['disabled'] = 'disabled'; + $row['tr_class'] = 'table-success'; } else { $row['stored'] = 'times'; $row['stored_time'] = ''; - $row['disabled'] = ''; } $row['used_code'] = $row['used_code'] == '' ? 'invalid' : $row['used_code']; if($row['used_code'] == $row['code']){ @@ -175,58 +177,13 @@ class saimod_beta extends \SYSTEM\SAI\sai_module{ return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_beta/tpl/store_ios.tpl'))->SERVERPATH(),$vars); } - public static function sai_mod__SAI_saimod_beta_action_store($email,$android,$ios){ - \SQL\BETA_STORE::QI(array($email)); - - return self::action_email($email,$android,$ios); - } - - /* public static function sai_mod__SAI_saimod_beta_action_mail(){ - $vars = array(); - - $vars['data'] = ''; - $beta = \SQL\BETA_MAIL_FIND::QQ(); - $i = 0; - while($row = $beta->next()){ - $row['i'] = $i++; - if($row['android']){ - $row['device'] = 'android';} - if($row['ios']){ - $row['device'] = 'apple';} - if($row['redeemedAt']){ - $row['redeemed'] = 'check'; - $row['redeemed_time'] = \SYSTEM\time::time_ago_string(strtotime($row['redeemedAt'])); - } else { - $row['redeemed'] = 'times'; - $row['redeemed_time'] = ''; - } - if($row['storedAt']){ - $row['stored'] = 'check'; - $row['stored_time'] = \SYSTEM\time::time_ago_string(strtotime($row['storedAt'])); - } else { - $row['stored'] = 'times'; - $row['stored_time'] = ''; - } - if($row['emailedAt']){ - $row['mailed'] = 'check'; - $row['mailed_time'] = \SYSTEM\time::time_ago_string(strtotime($row['emailedAt'])); - $row['disabled'] = 'disabled'; - } else { - $row['mailed'] = 'times'; - $row['mailed_time'] = ''; - $row['disabled'] = ''; - } - $row['used_code'] = $row['used_code'] == '' ? 'invalid' : $row['used_code']; - if($row['used_code'] == $row['code']){ - $row['valid'] = 'green'; - } else { - $row['valid'] = 'red'; - } - $vars['data'] .= \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_beta/tpl/mail_tr.tpl'))->SERVERPATH(),$row); + public static function sai_mod__SAI_saimod_beta_action_store($emails,$android,$ios){ + foreach($emails as $email){ + \SQL\BETA_STORE::QI(array($email)); + self::action_email($email,$android,$ios); } - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('time')); - return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_beta/tpl/mail.tpl'))->SERVERPATH(),$vars); - } */ + return \SYSTEM\LOG\JsonResult::ok(); + } public static function action_email($email,$android,$ios){ $bcc = null; diff --git a/democracy/sai/saimod_beta/sql/mysql/system_api.sql b/democracy/sai/saimod_beta/sql/mysql/system_api.sql index 6077112..f38e3b5 100644 --- a/democracy/sai/saimod_beta/sql/mysql/system_api.sql +++ b/democracy/sai/saimod_beta/sql/mysql/system_api.sql @@ -5,13 +5,9 @@ REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `na REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7020, 42, 2, 7000, 'comment', 'code', 'STRING'); REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7021, 42, 2, 7000, 'comment', 'comment', 'STRING'); -REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7030, 42, 2, 7000, 'store', 'email', 'STRING'); +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7030, 42, 2, 7000, 'store', 'emails', 'JSON'); REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7031, 42, 2, 7000, 'store', 'android', 'BOOL'); REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7032, 42, 2, 7000, 'store', 'ios', 'BOOL'); --- REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7040, 42, 2, 7000, 'email', 'email', 'STRING'); --- REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7041, 42, 2, 7000, 'email', 'android', 'BOOL'); --- REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7042, 42, 2, 7000, 'email', 'ios', 'BOOL'); - REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7050, 42, 2, 7000, 'code_delete', 'code', 'STRING'); -REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7060, 42, 2, 7000, 'email_delete', 'email', 'STRING'); \ No newline at end of file +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (7060, 42, 2, 7000, 'email_delete', 'emails', 'JSON'); \ No newline at end of file diff --git a/democracy/sai/saimod_beta/tpl/all.tpl b/democracy/sai/saimod_beta/tpl/all.tpl index f5c090d..28b94ac 100644 --- a/democracy/sai/saimod_beta/tpl/all.tpl +++ b/democracy/sai/saimod_beta/tpl/all.tpl @@ -10,7 +10,9 @@ Store Email Comment - Action + + + ${data} diff --git a/democracy/sai/saimod_beta/tpl/all_tr.tpl b/democracy/sai/saimod_beta/tpl/all_tr.tpl index 94837df..c618891 100644 --- a/democracy/sai/saimod_beta/tpl/all_tr.tpl +++ b/democracy/sai/saimod_beta/tpl/all_tr.tpl @@ -7,5 +7,7 @@  ${stored_time}  ${emailed_time} ${comment} - + + + \ No newline at end of file diff --git a/democracy/sai/saimod_beta/tpl/code_tr.tpl b/democracy/sai/saimod_beta/tpl/code_tr.tpl index 8d0de6c..2899206 100644 --- a/democracy/sai/saimod_beta/tpl/code_tr.tpl +++ b/democracy/sai/saimod_beta/tpl/code_tr.tpl @@ -7,7 +7,7 @@ ${count} - - + + \ No newline at end of file diff --git a/democracy/sai/saimod_beta/tpl/mail.tpl.old b/democracy/sai/saimod_beta/tpl/mail.tpl.old deleted file mode 100644 index 034f7c8..0000000 --- a/democracy/sai/saimod_beta/tpl/mail.tpl.old +++ /dev/null @@ -1,17 +0,0 @@ -
- - - - - - - - - - - - - - ${data} -
CodeEMailDeviceRedeemedStoreMailCommentAction
-
\ No newline at end of file diff --git a/democracy/sai/saimod_beta/tpl/mail_tr.tpl.old b/democracy/sai/saimod_beta/tpl/mail_tr.tpl.old deleted file mode 100644 index b5d4f79..0000000 --- a/democracy/sai/saimod_beta/tpl/mail_tr.tpl.old +++ /dev/null @@ -1,13 +0,0 @@ - - ${used_code} - ${email} - -  ${redeemed_time} -  ${stored_time} -  ${mailed_time} - ${comment} - - - - - \ No newline at end of file diff --git a/democracy/sai/saimod_beta/tpl/store_android.tpl b/democracy/sai/saimod_beta/tpl/store_android.tpl index ba2148b..194965d 100644 --- a/democracy/sai/saimod_beta/tpl/store_android.tpl +++ b/democracy/sai/saimod_beta/tpl/store_android.tpl @@ -9,7 +9,10 @@ Redeemed Store Comment - Action + + + + ${data} diff --git a/democracy/sai/saimod_beta/tpl/store_android_tr.tpl b/democracy/sai/saimod_beta/tpl/store_android_tr.tpl index 5f58d0a..2f2184e 100644 --- a/democracy/sai/saimod_beta/tpl/store_android_tr.tpl +++ b/democracy/sai/saimod_beta/tpl/store_android_tr.tpl @@ -1,4 +1,4 @@ - + ${used_code} ${email}  @@ -7,7 +7,6 @@  ${stored_time} ${comment} - - + \ No newline at end of file diff --git a/democracy/sai/saimod_beta/tpl/store_ios.tpl b/democracy/sai/saimod_beta/tpl/store_ios.tpl index 47d1c24..79c9ee5 100644 --- a/democracy/sai/saimod_beta/tpl/store_ios.tpl +++ b/democracy/sai/saimod_beta/tpl/store_ios.tpl @@ -9,7 +9,10 @@ Redeemed Store Comment - Action + + + + ${data} diff --git a/democracy/sai/saimod_beta/tpl/store_ios_tr.tpl b/democracy/sai/saimod_beta/tpl/store_ios_tr.tpl index 1c4805f..5360ca4 100644 --- a/democracy/sai/saimod_beta/tpl/store_ios_tr.tpl +++ b/democracy/sai/saimod_beta/tpl/store_ios_tr.tpl @@ -1,4 +1,4 @@ - + ${used_code} ${email}  @@ -7,7 +7,6 @@  ${stored_time} ${comment} - - + \ No newline at end of file diff --git a/democracy/sql/mysql/system_page.sql b/democracy/sql/mysql/system_page.sql index cfec929..7297dd1 100644 --- a/democracy/sql/mysql/system_page.sql +++ b/democracy/sql/mysql/system_page.sql @@ -1,7 +1,7 @@ REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (10, 1, 'home', 'home', -1, 0, 0, '#content', './?page=home', 'init_home', 'default_home'); REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (11, 1, 'citizen', 'citizen', -1, 0, 0, '#content', './?page=citizen', 'init_citizen', 'default_citizen'); REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (12, 1, 'politicians', 'politicians', -1, 0, 0, '#content', './?page=politicians', 'init_politicians', 'default_politicians'); -REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (13, 1, 'engeneering', 'engeneering', -1, 0, 0, '#content', './?page=engeneering', 'init_engeneering', 'default_engeneering'); +REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (13, 1, 'engineering', 'engineering', -1, 0, 0, '#content', './?page=engineering', 'init_engineering', 'default_engineering'); REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (60, 1, 'donate', 'donate', -1, 0, 0, '#content', './?page=donate', 'init_donate', 'default_donate'); REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (45, 1, 'datenschutz', 'datenschutz', -1, 0, 0, '#content', './?page=datenschutz', 'init_datenschutz', 'default_datenschutz');