diff --git a/sai/modules/saimod_sys_cron/saimod_sys_cron.css b/sai/modules/saimod_sys_cron/css/saimod_sys_cron.css similarity index 100% rename from sai/modules/saimod_sys_cron/saimod_sys_cron.css rename to sai/modules/saimod_sys_cron/css/saimod_sys_cron.css diff --git a/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js b/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js new file mode 100644 index 0000000..26168a4 --- /dev/null +++ b/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js @@ -0,0 +1,57 @@ +function init__SYSTEM_SAI_saimod_sys_cron() { + register_cron_add(); + register_cron_del(); + register_cron_edit(); +} + +function register_cron_del(){ + $('.btn_cron_del').click(function(){ + $.ajax({ type :'GET', + url : SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_cron&action=del'+ + '&cls='+$(this).attr('_class'), + success : function(data) { + if(data.status){ + alert('Sucess'); + }else{ + alert('Problem: '+data);} + } + }); + }); +} + +function register_cron_edit(){ + $('.btn_cron_edit').click(function(){ + $('#input_cron_class').val($(this).attr('_class')); + $('#input_cron_min').val($(this).attr('_min')); + $('#input_cron_hour').val($(this).attr('_hour')); + $('#input_cron_day').val($(this).attr('_day')); + $('#input_cron_day_week').val($(this).attr('_day_week')); + $('#input_cron_month').val($(this).attr('_month')); + $("#btn_cron_add").focus(); + }); +} + +function register_cron_add(){ + $('#btn_cron_add').click(function() { + var cls = $('#input_cron_class').val(); + var min = $('#input_cron_min').val(); + var hour = $('#input_cron_hour').val(); + var day = $('#input_cron_day').val(); + var day_week = $('#input_cron_day_week').val(); + var month = $('#input_cron_month').val(); + $.ajax({url: SAI_ENDPOINT, + data: { sai_mod: '.SYSTEM.SAI.saimod_sys_cron', + action: 'add', + cls: cls, + min: min, + hour: hour, + day: day, + day_week: day_week, + month: month}, + type: 'GET', + success: function(data) { + console.log("new cronjob added"); + } + }); + }); +} \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_ADD.php b/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_ADD.php index 703e62a..6bc9116 100644 --- a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_ADD.php +++ b/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON_ADD.php @@ -7,5 +7,6 @@ class SYS_SAIMOD_CRON_ADD extends \SYSTEM\DB\QP { //pg 'INSERT INTO '.\SYSTEM\DBD\system_cron::NAME_PG.' (class, min, hour, day, day_week, month) VALUES ($1, $2, $3, $4, $5, $6);', //mys -'INSERT INTO '.\SYSTEM\DBD\system_cron::NAME_MYS.' (class, min, hour, day, day_week, month) VALUES (?, ?, ?, ?, ?, ?);' +'INSERT INTO '.\SYSTEM\DBD\system_cron::NAME_MYS.' (class, min, hour, day, day_week, month) VALUES (?, ?, ?, ?, ?, ?)'. +' ON DUPLICATE KEY UPDATE `min`=VALUES(`min`),`hour`=VALUES(`hour`),`day`=VALUES(`day`),`day_week`=VALUES(`day_week`),`month`=VALUES(`month`);' );}} diff --git a/sai/modules/saimod_sys_cron/saimod_sys_cron.js b/sai/modules/saimod_sys_cron/saimod_sys_cron.js deleted file mode 100644 index 635f5b2..0000000 --- a/sai/modules/saimod_sys_cron/saimod_sys_cron.js +++ /dev/null @@ -1,63 +0,0 @@ -function init__SYSTEM_SAI_saimod_sys_cron() { - saimod_sys_cron_register_clickevents();} - -function saimod_sys_cron_register_clickevents(){ - $('tr.cron_entries').click(function() { - console.log("ahsf"); - $.ajax({ - url: SAI_ENDPOINT, - data: { sai_mod: '.SYSTEM.SAI.saimod_sys_cron', - action: 'deldialog', - cls: $(this).attr("cls")}, - type: 'GET', - success: function(data) { - console.log("works"); - $('#cron_content').html(data); - $('#del_cron_close').click(function() { - console.log("olenski"); - $('#del_api_description').hide(); - $('#del_api_del').show(); - }); - $('#del_cron_del').click(function() { - $.ajax({ - url: SAI_ENDPOINT, - data: { sai_mod: '.SYSTEM.SAI.saimod_sys_cron', - action: 'del', - cls: $(this).attr("cls")}, - type: 'GET', - success: function(data) { - console.log("cron call deleted"); - $('#cron_deletedialog').html('

Api call deleted!

'); - $('#del_cron_del').hide(); - }});});}});}); - - $('#addcron').click(function() { - var cls = $('#new_cron_class').val(); - var min = $('#new_cron_min').val(); - var hour = $('#new_cron_hour').val(); - var day = $('#new_cron_day').val(); - var day_week = $('#new_cron_day_week').val(); - var month = $('#new_cron_month').val(); - $.ajax({ - url: SAI_ENDPOINT, - data: { sai_mod: '.SYSTEM.SAI.saimod_sys_cron', - action: 'add', - cls: cls, - min: min, - hour: hour, - day: day, - day_week: day_week, - month: month}, - type: 'GET', - success: function(data) { - console.log("new cronjob added"); - } - }); - - }); - $('#del_cron_close').click(function() { - console.log("olenski"); - $('#del_cron_description').hide(); - $('#del_cron_del').show(); - }); -} \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/saimod_sys_cron.php b/sai/modules/saimod_sys_cron/saimod_sys_cron.php index 85bfab3..49da9b7 100644 --- a/sai/modules/saimod_sys_cron/saimod_sys_cron.php +++ b/sai/modules/saimod_sys_cron/saimod_sys_cron.php @@ -14,10 +14,6 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule { return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tpl/tabs.tpl'), $vars); } - public static function sai_mod__system_sai_saimod_sys_cron_action_deldialog($cls){ - $res = \SYSTEM\DBD\SYS_SAIMOD_CRON_SINGLE_SELECT::Q1(array($cls)); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tpl/delete_dialog.tpl'), $res);} - public static function sai_mod__system_sai_saimod_sys_cron_action_add($cls,$min,$hour,$day,$day_week,$month){ if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_CRON)){ throw new \SYSTEM\LOG\ERROR("You dont have edit Rights - Cant proceeed");} @@ -37,8 +33,8 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_cron_flag_css(){ return \SYSTEM\LOG\JsonResult::toString( - array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/saimod_sys_cron.css')));} + array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/css/saimod_sys_cron.css')));} public static function sai_mod__SYSTEM_SAI_saimod_sys_cron_flag_js(){ return \SYSTEM\LOG\JsonResult::toString( - array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/saimod_sys_cron.js')));} + array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/js/saimod_sys_cron.js')));} } \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/tpl/delete_dialog.tpl b/sai/modules/saimod_sys_cron/tpl/delete_dialog.tpl deleted file mode 100644 index 9a2fa04..0000000 --- a/sai/modules/saimod_sys_cron/tpl/delete_dialog.tpl +++ /dev/null @@ -1,24 +0,0 @@ -
-
Cron Job: ${class}
-
- - - - - - - - - - - - - - - - - -
classminhourdayday_weekmonth
${class}${min}${hour}${day}${day_week}${month}
-
- - diff --git a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl index 75fd5a4..d592793 100644 --- a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl +++ b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl @@ -8,4 +8,8 @@ ${last_run} ${next} ${status} + + + + \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/tpl/tabs.tpl b/sai/modules/saimod_sys_cron/tpl/tabs.tpl index a8a48ca..e426171 100644 --- a/sai/modules/saimod_sys_cron/tpl/tabs.tpl +++ b/sai/modules/saimod_sys_cron/tpl/tabs.tpl @@ -1,7 +1,8 @@

System Cron

- Last Visit: ${last_visit} + Last Visit: ${last_visit}
+ Start Cron
@@ -14,18 +15,20 @@ + ${content} - - - - - - + + + + + + - + +
last_run next_run statusaction