From e84826e6d3efbcc3e82335e815ac1359de6c2c75 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Fri, 12 Dec 2014 03:51:15 +0100
Subject: [PATCH] cron last visited

---
 cron/cron.php                                   |  7 +++++--
 cron/cronstatus.php                             | 10 +++++-----
 dbd/qq/SYS_CRON_LAST_VISIT.php                  | 11 +++++++++++
 sai/modules/saimod_sys_cron/saimod_sys_cron.php |  2 ++
 sai/modules/saimod_sys_cron/tpl/tabs.tpl        | 13 +++++++------
 5 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 dbd/qq/SYS_CRON_LAST_VISIT.php

diff --git a/cron/cron.php b/cron/cron.php
index 7e73d90..7b597c0 100644
--- a/cron/cron.php
+++ b/cron/cron.php
@@ -26,7 +26,7 @@ class cron {
                                                     continue;}
             //Status is ok?
             if($cron[\SYSTEM\DBD\system_cron::FIELD_STATUS] != \SYSTEM\CRON\cronstatus::CRON_STATUS_SUCCESFULLY){
-                new \SYSTEM\LOG\CRON('Cron for Class '.$cron[\SYSTEM\DBD\system_cron::FIELD_CLASS].' could not execute cuz Status aint good: '. \SYSTEM\CRON\cronstatus::decode($cron[\SYSTEM\DBD\system_cron::FIELD_STATUS]));
+                new \SYSTEM\LOG\CRON('Cron for Class '.$cron[\SYSTEM\DBD\system_cron::FIELD_CLASS].' could not execute cuz Status aint good: '. \SYSTEM\CRON\cronstatus::text($cron[\SYSTEM\DBD\system_cron::FIELD_STATUS]));
                 continue;}
             //set running
             self::status($cron[\SYSTEM\DBD\system_cron::FIELD_CLASS], \SYSTEM\CRON\cronstatus::CRON_STATUS_RUNNING);
@@ -50,6 +50,9 @@ class cron {
     }
     
     private static function status($class, $status){
-        new \SYSTEM\LOG\CRON('Cron Status for Class '.$class.' updated to: '. \SYSTEM\CRON\cronstatus::decode($status));
+        new \SYSTEM\LOG\CRON('Cron Status for Class '.$class.' updated to: '. \SYSTEM\CRON\cronstatus::text($status));
         return \SYSTEM\DBD\SYS_CRON_UPD::QI(array($status,time(),$class));}
+    
+    public static function last_visit(){
+        return \SYSTEM\DBD\SYS_CRON_LAST_VISIT::Q1()['time'];}
 }
\ No newline at end of file
diff --git a/cron/cronstatus.php b/cron/cronstatus.php
index 5d9f077..c88c108 100644
--- a/cron/cronstatus.php
+++ b/cron/cronstatus.php
@@ -9,19 +9,19 @@ class cronstatus {
     
     const CRON_STATUS_USER_STATES   = 99;
     
-    public static function decode($status){
+    public static function text($status){
         switch($status){
             case self::CRON_STATUS_SUCCESFULLY:
-                $status = 'CRON_STATUS_SUCCESFULLY';
+                $status = 'SUCCESFULLY';
                 break;
             case self::CRON_STATUS_RUNNING:
-                $status = 'CRON_STATUS_RUNNING';
+                $status = 'RUNNING';
                 break;
             case self::CRON_STATUS_FAIL:
-                $status = 'CRON_STATUS_FAIL';
+                $status = 'FAIL';
                 break;
             case self::CRON_STATUS_FAIL_CLASS:
-                $status = 'CRON_STATUS_FAIL_CLASS';
+                $status = 'FAIL_CLASS';
                 break;
         }
         return $status;
diff --git a/dbd/qq/SYS_CRON_LAST_VISIT.php b/dbd/qq/SYS_CRON_LAST_VISIT.php
new file mode 100644
index 0000000..c87e994
--- /dev/null
+++ b/dbd/qq/SYS_CRON_LAST_VISIT.php
@@ -0,0 +1,11 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_CRON_LAST_VISIT extends \SYSTEM\DB\QQ {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE class =  \'SYSTEM\LOG\WARNING\' ORDER BY time DESC LIMIT 1;',
+//mys
+'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE class = "SYSTEM\\\\LOG\\\\CRON" ORDER BY time DESC LIMIT 1'
+);}}
\ 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 44e61b9..85bfab3 100644
--- a/sai/modules/saimod_sys_cron/saimod_sys_cron.php
+++ b/sai/modules/saimod_sys_cron/saimod_sys_cron.php
@@ -5,9 +5,11 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule {
     public static function sai_mod__SYSTEM_SAI_saimod_sys_cron(){
         $vars = array();
         $vars['content'] = '';
+        $vars['last_visit'] = \SYSTEM\CRON\cron::last_visit();
         $res = \SYSTEM\DBD\SYS_SAIMOD_CRON::QQ();
         while($r = $res->next()){
             $r['next'] = date('Y-m-d H:i:s',\SYSTEM\CRON\cron::next($r['class']));
+            $r['status'] = \SYSTEM\CRON\cronstatus::text($r['status']);
             $vars['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tpl/list_entry.tpl'), $r);}   
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/tpl/tabs.tpl'), $vars);
     }
diff --git a/sai/modules/saimod_sys_cron/tpl/tabs.tpl b/sai/modules/saimod_sys_cron/tpl/tabs.tpl
index 0e2de9e..a8a48ca 100644
--- a/sai/modules/saimod_sys_cron/tpl/tabs.tpl
+++ b/sai/modules/saimod_sys_cron/tpl/tabs.tpl
@@ -1,6 +1,7 @@
 <div id="cron_wrapper">
     <h4>System Cron</h4>
     <hr>
+    Last Visit: ${last_visit}
     <div id="cron_content">
         <table class="table table-hover table-condensed sai_table" style="overflow: auto;">
             <tr>
@@ -16,12 +17,12 @@
             </tr>
             ${content}
             <tr>
-                <td><input type="text" id="new_cron_class" placeholder="class" style="width: 140px;"></td>
-                <td><input type="text" id="new_cron_min" placeholder="min" style="width: 140px;"></td>
-                <td><input type="text" id="new_cron_hour" placeholder="hour" style="width: 140px;"></td>
-                <td><input type="text" id="new_cron_day" placeholder="day" style="width: 140px;"></td>
-                <td><input type="text" id="new_cron_day_week" placeholder="day_week" style="width: 140px;"></td>
-                <td><input type="text" id="new_cron_month" placeholder="month" style="width: 140px;"></td>
+                <td><input type="text" id="new_cron_class" placeholder="class" style="width: 200px;"></td>
+                <td><input type="text" id="new_cron_min" placeholder="min" style="width: 40px;"></td>
+                <td><input type="text" id="new_cron_hour" placeholder="hour" style="width: 40px;"></td>
+                <td><input type="text" id="new_cron_day" placeholder="day" style="width: 40px;"></td>
+                <td><input type="text" id="new_cron_day_week" placeholder="day_week" style="width: 40px;"></td>
+                <td><input type="text" id="new_cron_month" placeholder="month" style="width: 40px;"></td>
                 <td></td>
                 <td></td>
                 <td><button type="button" class="btn-small btn-success" id="addcron">Add</button></td>